From 0d5fc66586f31c804574c9f1508c8a77a0fb3ed9 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mar 21 2015 14:14:30 +0000
Subject: update to latest git


Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index d7e8a03..0fd7250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /meson-7581895.tar.gz
 /meson-f9f51b1.tar.gz
 /meson-fa2c659.tar.gz
+/meson-a5f30e7.tar.gz
+/meson-a084a8e.tar.gz
diff --git a/0001-install-install-rpm-macros-if-RPM-bin-in-system.-Clo.patch b/0001-install-install-rpm-macros-if-RPM-bin-in-system.-Clo.patch
new file mode 100644
index 0000000..621fc2a
--- /dev/null
+++ b/0001-install-install-rpm-macros-if-RPM-bin-in-system.-Clo.patch
@@ -0,0 +1,26 @@
+From 9e9bc5223c49bc51dbfd266f5dc89f2874016622 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sat, 21 Mar 2015 17:11:04 +0300
+Subject: [PATCH] install: install rpm macros if RPM bin in system. Closes #56
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ install_meson.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/install_meson.py b/install_meson.py
+index 616b635..2c13046 100755
+--- a/install_meson.py
++++ b/install_meson.py
+@@ -107,7 +107,7 @@ if os.path.exists(module_dir):
+     shutil.rmtree(module_dir)
+ shutil.copytree('modules', module_dir)
+ 
+-if os.path.exists(os.path.join('/usr', rpmmacros_dir)):
++if os.path.exists('/usr/bin/rpm'):
+     print('Installing RPM macros to %s.' % rpmmacros_dir)
+     outfilename = os.path.join(rpmmacros_dir, 'macros.meson')
+     os.makedirs(rpmmacros_dir, exist_ok=True)
+-- 
+2.3.3
+
diff --git a/meson.spec b/meson.spec
index cbcfc34..cc08847 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,7 +1,7 @@
 %global __python %{__python3}
-%global commit fa2c659825031c599f59e0a863e8266614e6756f
+%global commit a084a8ec3ec12e91c3897dc6b805636be6d36527
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global date 20150316
+%global date 20150321
 
 Name:           meson
 Version:        0.22.0
@@ -12,6 +12,8 @@ License:        ASL 2.0
 URL:            https://jpakkane.github.io/meson/
 #Source0:        https://github.com/jpakkane/meson/archive/%{version}/%{name}-%{version}.tar.gz
 Source0:        https://github.com/jpakkane/meson/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+# https://github.com/jpakkane/meson/pull/57
+Patch0:         0001-install-install-rpm-macros-if-RPM-bin-in-system.-Clo.patch
 BuildArch:      noarch
 
 BuildRequires:  python3-devel ninja-build
@@ -49,7 +51,7 @@ Requires:       python3-qt5
 GUI for high productivity build system.
 
 %prep
-%setup -qn %{name}-%{commit}
+%autosetup -n %{name}-%{commit}
 # protobuf broken
 rm -rf "test cases/frameworks/5 protocol buffers/"
 
@@ -70,11 +72,12 @@ chmod +x %{buildroot}%{_bindir}/meson*
 %{_bindir}/%{name}
 %{_bindir}/%{name}conf
 %dir %{_datadir}/%{name}/
-%exclude /*.ui
-%exclude /mesongui.py
+%exclude %{_datadir}/%{name}/*.ui
+%exclude %{_datadir}/%{name}/mesongui.py
 %{_datadir}/%{name}/*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/man1/%{name}conf.1.*
+%{_rpmconfigdir}/macros.d/macros.%{name}
 
 %files gui
 %license COPYING
@@ -84,6 +87,9 @@ chmod +x %{buildroot}%{_bindir}/meson*
 %{_mandir}/man1/%{name}gui.1.*
 
 %changelog
+* Sat Mar 21 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-7.20150321gita084a8e
+- update to latest git
+
 * Mon Mar 16 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.22.0-7.20150316gitfa2c659
 - update to latest git
 
diff --git a/sources b/sources
index 406ed29..8a92b42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-063fd80f5c1700f49d55e3a1f63936a7  meson-fa2c659.tar.gz
+a43414ba2781ff1d8f838018ef1995b5  meson-a084a8e.tar.gz