From: Marcin Banasiak <marcin.banasiak@gmail.com>
Date: Tue, 12 Sep 2017 19:28:42 +0000 (+0200)
Subject: Update to 0.42.1
X-Git-Tag: auto/th/meson-0.42.1-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmeson.git;a=commitdiff_plain;h=7e08889

Update to 0.42.1

- added -gtkdocdir.patch to fix installation path of gtkdoc
documentation
---

diff --git a/meson-gtkdocdir.patch b/meson-gtkdocdir.patch
new file mode 100644
index 0000000..70c56bb
--- /dev/null
+++ b/meson-gtkdocdir.patch
@@ -0,0 +1,11 @@
+--- meson-0.42.1/mesonbuild/scripts/gtkdochelper.py.pathfix	2017-09-12 21:21:54.832059192 +0200
++++ meson-0.42.1/mesonbuild/scripts/gtkdochelper.py	2017-09-12 21:22:03.258725859 +0200
+@@ -226,7 +226,7 @@ def run(args):
+         install_gtkdoc(options.builddir,
+                        options.subdir,
+                        install_prefix,
+-                       'share/gtk-doc/html',
++                       'share/doc/gtk-doc/html',
+                        install_dir)
+     return 0
+ 
diff --git a/meson.spec b/meson.spec
index f7bd5b6..73f97a6 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,13 +1,14 @@
 Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
-Version:	0.40.1
-Release:	2
+Version:	0.42.1
+Release:	1
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
 Source0:	https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	8475b19d5f5f3bd5c40f4bb1f31b93f3
+# Source0-md5:	a8ff06ab5e138dec64cbfa249ff4f8bb
+Patch0:		%{name}-gtkdocdir.patch
 URL:		http://mesonbuild.com/
 BuildRequires:	ninja >= 1.5
 BuildRequires:	python3 >= 1:3.4
@@ -32,6 +33,7 @@ takich jak testy jednostkowe, raporty pokrycia, Valgrind, CCache itp.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
 	meson.py mesonconf.py mesonintrospect.py mesontest.py wraptool.py
@@ -47,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc authors.txt contributing.txt README.md
+%doc contributing.txt README.md
 %attr(755,root,root) %{_bindir}/meson
 %attr(755,root,root) %{_bindir}/mesonconf
 %attr(755,root,root) %{_bindir}/mesonintrospect