From b67acfc66337841cd01cfb6ee7512181077e8a62 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 15 Nov 2016 06:35:41 -0600 Subject: [PATCH] use /usr/share/appdata, improve /var/cache/app-info --- appstream.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/appstream.spec b/appstream.spec index 915ad81..f0c4fa6 100644 --- a/appstream.spec +++ b/appstream.spec @@ -5,7 +5,7 @@ Summary: Utilities to generate, maintain and access the AppStream database Name: appstream Version: 0.10.3 -Release: 2%{?dist} +Release: 4%{?dist} # lib LGPLv2+, tools GPLv2+ License: GPLv2+ and LGPLv2+ @@ -90,11 +90,16 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -mkdir -p %{buildroot}/var/cache/app-info/{icons,xapian,xmls} +mkdir -p %{buildroot}/var/cache/app-info/{icons,gv,xmls} touch %{buildroot}/var/cache/app-info/cache.watch %find_lang appstream +# move metainfo to right/legacy location, at least until our tools can handle it +mkdir -p %{buildroot}%{_datadir}/appdata/ +mv %{buildroot}%{_datadir}/metainfo/*.xml \ + %{buildroot}%{_datadir}/appdata/ + %check make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" @@ -121,14 +126,13 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %{_libdir}/girepository-1.0/AppStream-1.0.typelib %{_libdir}/libappstream.so.4* %{_libdir}/libappstream.so.%{version} -%dir %{_datadir}/metainfo/ -%{_datadir}/metainfo/org.freedesktop.appstream.cli.metainfo.xml +%{_datadir}/appdata/org.freedesktop.appstream.cli.*.xml # put in -devel? -- rex %{_datadir}/gettext/its/metainfo.* %ghost /var/cache/app-info/cache.watch %dir /var/cache/app-info/ %dir /var/cache/app-info/icons/ -%dir /var/cache/app-info/xapian/ +%dir /var/cache/app-info/gv/ %dir /var/cache/app-info/xmls/ %files devel @@ -161,6 +165,9 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" %changelog +* Tue Nov 15 2016 Rex Dieter - 0.10.3-4 +- use /usr/share/appdata, improve /var/cache/app-info + * Mon Nov 14 2016 Rex Dieter - 0.10.3-2 - pull in upstream crash fix