X-Git-Url: http://git.pld-linux.org/?p=packages%2FAppStream.git;a=blobdiff_plain;f=AppStream.spec;h=70fb08c616eeb02fc7858489bb2abceff084a6eb;hp=8a954fc52039b94dc9011eae1059a3fd3c00dba2;hb=0ae0c7b4b61270113e919375f4085ceb0c295a8a;hpb=36752e97d4fa545f21cd253c3d2fe187b3b5322c

diff --git a/AppStream.spec b/AppStream.spec
index 8a954fc..70fb08c 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -8,38 +8,44 @@
 Summary:	AppStream-Core library and tools
 Summary(pl.UTF-8):	Biblioteka i narzędzia AppStream-Core
 Name:		AppStream
-Version:	0.9.2
+Version:	0.11.8
 Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	https://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	a7f0312c39a7eb6c557c4126a4d71cf6
+# Source0-md5:	887436049bd96c47ffccef107452c87d
+Patch0:		cmake.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.36
+BuildRequires:	glib2-devel >= 1:2.46
 BuildRequires:	gobject-introspection-devel
-BuildRequires:	intltool
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	itstool
+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:	xapian-core-devel >= 1.2
+BuildRequires:	xmlto
 BuildRequires:	xz
 BuildRequires:	yaml-devel >= 0.1
 %if %{with qt}
 BuildRequires:	Qt5Core-devel >= 5.0
+BuildRequires:	Qt5Test-devel >= 5.0
+BuildRequires:	qt5-build >= 5.0
 BuildRequires:	qt5-qmake >= 5.0
 %endif
 %if %{with apidocs}
 BuildRequires:	gtk-doc
 BuildRequires:	publican
-BuildRequires:	xmlto
+BuildRequires:	python3
 %endif
-Requires:	glib2 >= 1:2.36
-Requires:	xapian-core-libs >= 1.2
+Requires:	glib2 >= 1:2.46
 Obsoletes:	PackageKit-plugin-appstream
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,7 +62,7 @@ Summary:	Header files for AppStream library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki AppStream
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.36
+Requires:	glib2-devel >= 1:2.46
 
 %description devel
 Header files for AppStream library.
@@ -83,7 +89,6 @@ Summary:	AppstreamQt library
 Summary(pl.UTF-8):	Biblioteka AppstreamQt
 Group:		Libraries
 Requires:	Qt5Core >= 5.0
-Requires:	xapian-core-libs >= 1.2
 
 %description qt
 AppstreamQt library.
@@ -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}
@@ -171,11 +176,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS MAINTAINERS NEWS README.md RELEASE
 %attr(755,root,root) %{_bindir}/appstreamcli
 %attr(755,root,root) %{_libdir}/libappstream.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libappstream.so.3
+%attr(755,root,root) %ghost %{_libdir}/libappstream.so.4
 %{_libdir}/girepository-1.0/AppStream-1.0.typelib
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/appstream.conf
-%dir %{_datadir}/app-info
-%{_datadir}/app-info/categories.xml
+%dir %{_datadir}/metainfo
+%{_datadir}/metainfo/org.freedesktop.appstream.cli.metainfo.xml
 %if %{with apt}
 /etc/apt/apt.conf.d/50appstream
 %endif
@@ -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}
@@ -198,24 +203,24 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with qt}
 %files qt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libAppstreamQt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libAppstreamQt.so.1
+%attr(755,root,root) %{_libdir}/libAppStreamQt.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libAppStreamQt.so.2
 
 %files qt-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libAppstreamQt.so
-%{_includedir}/AppstreamQt
-%{_libdir}/cmake/AppstreamQt
+%attr(755,root,root) %{_libdir}/libAppStreamQt.so
+%{_includedir}/AppStreamQt
+%{_libdir}/cmake/AppStreamQt
 %endif
 
 %files -n gettext-its-metainfo
 %defattr(644,root,root,755)
-%dir %{_datadir}/gettext/its
 %{_datadir}/gettext/its/metainfo.its
 %{_datadir}/gettext/its/metainfo.loc
 
 %if %{with vala}
 %files -n vala-appstream
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/appstream.deps
 %{_datadir}/vala/vapi/appstream.vapi
 %endif