diff --git a/.gitignore b/.gitignore index b388e7e..52affde 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/AppStream-0.11.2.tar.xz +/AppStream-0.11.4.tar.xz diff --git a/appstream.spec b/appstream.spec index e30f068..9c7969b 100644 --- a/appstream.spec +++ b/appstream.spec @@ -4,8 +4,8 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream -Version: 0.11.2 -Release: 4%{?dist} +Version: 0.11.4 +Release: 1%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -18,6 +18,7 @@ Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{vers ## upstreamable patches BuildRequires: cmake +BuildRequires: meson BuildRequires: gettext BuildRequires: intltool BuildRequires: itstool @@ -28,6 +29,7 @@ BuildRequires: pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(protobuf-lite) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(yaml-0.1) +BuildRequires: publican BuildRequires: xmlto Requires: appstream-data @@ -75,19 +77,15 @@ Requires: vala %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake} .. \ - -DQT:BOOL=ON \ - -DTESTS:BOOL=ON \ - -DVAPI:BOOL=%{?vala:ON}%{!?vala:OFF} -popd - -make %{?_smp_mflags} -C %{_target_platform} +%{meson} \ + -Dqt=true \ + -Dvapi=true \ + -Ddocumentation=true +%{meson_build} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%{meson_install} mkdir -p %{buildroot}/var/cache/app-info/{icons,gv,xmls} touch %{buildroot}/var/cache/app-info/cache.watch @@ -101,7 +99,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %check -make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" +%{meson_test} %post -p /sbin/ldconfig @@ -135,7 +133,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %dir /var/cache/app-info/xmls/ %files devel -%{_includedir}/AppStream/ +%{_includedir}/appstream/ %{_libdir}/libappstream.so %{_libdir}/pkgconfig/appstream.pc %dir %{_datadir}/gir-1.0/ @@ -165,6 +163,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %changelog +* Thu Sep 07 2017 Rex Dieter - 0.11.4-1 +- 0.11.4 9 (#1486970) + * Sun Aug 06 2017 Björn Esser - 0.11.2-4 - Rebuilt for AutoReq cmake-filesystem diff --git a/sources b/sources index a9e568f..3fdea20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AppStream-0.11.2.tar.xz) = 175b412be867f7d26d86547c03bbb56e0e10da42e3fec4d9c5122f86433876147350071439f30176f61d1cf480386ebaa13f3d9a0eb5a7ab6508fc02f3f1d83b +SHA512 (AppStream-0.11.4.tar.xz) = 8e8784c0460d5333603b2d754719db54bbf1c90a5fbdac9a6799d469e32ac0ec830fb320a3b9eae1d1e1c00c7f6484a6552698a11a4952da6f4281a1cdb26fdb