[packages/AppStream] - updated to 0.11.7; now uses meson to build - added meson patch (fixes backslash conversion issue)

[qboosh]

commit 739d45aef24c4f5bab883477f54e510be9d769c8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 23 20:32:03 2017 +0100

    - updated to 0.11.7; now uses meson to build
    - added meson patch (fixes backslash conversion issue)

 AppStream-meson.patch | 12 ++++++++++++
 AppStream.spec        | 35 ++++++++++++++++++++---------------
 2 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/AppStream.spec b/AppStream.spec
index 8bc0833..7759281 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -8,23 +8,27 @@
 Summary:	AppStream-Core library and tools
 Summary(pl.UTF-8):	Biblioteka i narzędzia AppStream-Core
 Name:		AppStream
-Version:	0.11.1
+Version:	0.11.7
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	https://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	24d330338e0f8a5b5b8c0b1266ea3b41
+# Source0-md5:	9ebc5f5dff51ee6f4d15fdadd782caa7
+Patch0:		%{name}-meson.patch
 URL:		https://www.freedesktop.org/wiki/Distributions/AppStream/
-BuildRequires:	cmake >= 3.2.0
+BuildRequires:	docbook-style-xsl-nons
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.46
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	itstool
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libstdc++-devel >= 6:4.9
 BuildRequires:	libstemmer-devel
 BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	libxslt-progs
+BuildRequires:	meson >= 0.42
 BuildRequires:	pkgconfig
 BuildRequires:	protobuf-devel
+BuildRequires:	rpmbuild(macros) >= 1.727
 BuildRequires:	tar >= 1:1.22
 %{?with_vala:BuildRequires:	vala}
 BuildRequires:	xmlto
@@ -39,6 +43,7 @@ BuildRequires:	qt5-qmake >= 5.0
 %if %{with apidocs}
 BuildRequires:	gtk-doc
 BuildRequires:	publican
+BuildRequires:	python3
 %endif
 Requires:	glib2 >= 1:2.46
 Obsoletes:	PackageKit-plugin-appstream
@@ -134,23 +139,23 @@ API języka Vala do biblioteki AppStream.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake .. \
-	%{?with_apt:-DAPT_SUPPORT=ON} \
-	%{?with_apidocs:-DDOCUMENTATION=ON} \
-	%{?with_qt:-DQT=ON} \
-	%{?with_vala:-DVAPI=ON}
+%meson build \
+	%{?with_apidocs:-Ddocs=true} \
+	%{?with_apt:-Dapt-support=true} \
+	%{?with_qt:-Dqt=true} \
+	-Dgir=true \
+	-Dstemming=true \
+	%{?with_vala:-Dvapi=true}
 
-%{__make} -j1
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C build install \
-	DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 install -d $RPM_BUILD_ROOT%{_docdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/gtk-doc $RPM_BUILD_ROOT%{_docdir}
@@ -185,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libappstream.so
 %{_datadir}/gir-1.0/AppStream-1.0.gir
-%{_includedir}/AppStream
+%{_includedir}/appstream
 %{_pkgconfigdir}/appstream.pc
 
 %if %{with apidocs}
diff --git a/AppStream-meson.patch b/AppStream-meson.patch
new file mode 100644
index 0000000..ca09094
--- /dev/null
+++ b/AppStream-meson.patch
@@ -0,0 +1,12 @@
+meson since version ? converts backslashes to slashes, use other way to get pure filenames
+--- AppStream-0.11.7/po/meson.build.orig	2017-10-22 19:36:07.000000000 +0200
++++ AppStream-0.11.7/po/meson.build	2017-12-23 14:05:05.250748125 +0100
+@@ -21,7 +21,7 @@
+         'find ' + meson.current_source_dir() +
+         ' -type f' +
+         ' -iname "*.po"' +
+-        ' -printf \'%f\\n\'' +
++        ' -print | sed -e \'s,.*/,,\'' +
+         ' | grep -oP \'.*(?=[.])\' | sort' +
+         ' > ' + join_paths(meson.current_source_dir(), 'LINGUAS')
+     ]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/AppStream.git/commitdiff/739d45aef24c4f5bab883477f54e510be9d769c8