- fix upstream cmake breakage

[packages/AppStream.git] / AppStream.spec

diff --git a/AppStream.spec b/AppStream.spec
index a98c0c50a2df75b6d3cb29fd1267ac3afe1aebb9..70fb08c616eeb02fc7858489bb2abceff084a6eb 100644 (file)
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -8,24 +8,27 @@
 Summary:       AppStream-Core library and tools
 Summary(pl.UTF-8):     Biblioteka i narzędzia AppStream-Core
 Name:          AppStream
-Version:       0.10.1
-Release:       1
+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: a07a54f47a8bc5fafb7d87e86888e019
-Patch0:                %{name}-libstemmer.patch
+# 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.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: xmlto
@@ -33,12 +36,14 @@ 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: python3
 %endif
 Requires:      glib2 >= 1:2.46
 Obsoletes:     PackageKit-plugin-appstream
@@ -137,21 +142,20 @@ API języka Vala do biblioteki AppStream.
 %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}
@@ -186,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}
@@ -199,14 +203,14 @@ 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
@@ -217,5 +221,6 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with vala}
 %files -n vala-appstream
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/appstream.deps
 %{_datadir}/vala/vapi/appstream.vapi
 %endif