From 976c942984c2b020bf6f117502ad7044cb68b66ec4cb28372bf7ce157fa9c8d3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 26 Apr 2018 11:40:42 +0000 Subject: [PATCH] Accepting request 601507 from GNOME:Next - Update to version 1.0.1+git.20180426: * systemd-service: we only need local filesystem, no network. - Update to version 1.0.1+git.20180425: * Rewrite InstallAppdata in python, having slightly better control over the execution * Add systemd service to resync the repodata cache (boo#1009745). OBS-URL: https://build.opensuse.org/request/show/601507 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libzypp-plugin-appdata?expand=0&rev=47 --- _servicedata | 2 +- libzypp-plugin-appdata-rpmlintrc | 4 +++ libzypp-plugin-appdata.changes | 14 +++++++++ libzypp-plugin-appdata.spec | 30 ++++++++++++++++++-- openSUSE-appstream-1.0.1+git.20180327.tar.xz | 3 -- openSUSE-appstream-1.0.1+git.20180426.tar.xz | 3 ++ 6 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 libzypp-plugin-appdata-rpmlintrc delete mode 100644 openSUSE-appstream-1.0.1+git.20180327.tar.xz create mode 100644 openSUSE-appstream-1.0.1+git.20180426.tar.xz diff --git a/_servicedata b/_servicedata index 9cf54e5..37da4c4 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/DimStar77/openSUSE-appstream.git - 4852b6d6bcdc33e1d8c315657e3ffb8dfbf81410 \ No newline at end of file + 8708ff5b3330e28eefb228a78d719871ff5bd6da \ No newline at end of file diff --git a/libzypp-plugin-appdata-rpmlintrc b/libzypp-plugin-appdata-rpmlintrc new file mode 100644 index 0000000..bb9ae11 --- /dev/null +++ b/libzypp-plugin-appdata-rpmlintrc @@ -0,0 +1,4 @@ +# W: shlib-policy-missing-lib: false positive: this integrates with libzypp, name is correct +addFilter("shlib-policy-missing-lib"); +# W: suse-missing-rclink: the service is not meant to be manually started, hence the rcFOO link makes no sense +addFilter("suse-missing-rclink"); diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes index 0bf5073..5bfcfea 100644 --- a/libzypp-plugin-appdata.changes +++ b/libzypp-plugin-appdata.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Apr 26 08:01:48 UTC 2018 - dimstar@opensuse.org + +- Update to version 1.0.1+git.20180426: + * systemd-service: we only need local filesystem, no network. + +------------------------------------------------------------------- +Wed Apr 25 16:03:37 UTC 2018 - dimstar@opensuse.org + +- Update to version 1.0.1+git.20180425: + * Rewrite InstallAppdata in python, having slightly better + control over the execution + * Add systemd service to resync the repodata cache (boo#1009745). + ------------------------------------------------------------------- Fri Apr 20 13:45:17 UTC 2018 - dimstar@opensuse.org diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec index aaac340..6fdce58 100644 --- a/libzypp-plugin-appdata.spec +++ b/libzypp-plugin-appdata.spec @@ -17,13 +17,14 @@ Name: libzypp-plugin-appdata -Version: 1.0.1+git.20180327 +Version: 1.0.1+git.20180426 Release: 0 Summary: Extend libzypp to handle AppStream metadata License: MIT AND CC0-1.0 Group: System/Libraries URL: https://wiki.gnome.org/Design/Apps/Software Source0: openSUSE-appstream-%{version}.tar.xz +Source99: libzypp-plugin-appdata-rpmlintrc # appstreamcli is provided by the AppStream package Requires: AppStream # appstream-glib >= 0.3.6 is the first to correctly to appstream-util uninstall in /var/cache @@ -67,16 +68,39 @@ install -m 0755 -d %{buildroot}%{_datadir}/appdata-extra cp appdata-extra/*/* %{buildroot}%{_datadir}/appdata-extra/ # Install AppData zypp plugin -install -Dm 0755 InstallAppdata.sh %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh +install -Dm 0755 InstallAppdata.py %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata install -Dm 0755 AsHelper.py %{buildroot}%{_libexecdir}/AsHelper +# Install zypper helper command +install -Dm 0755 zypper-appstream-cache %{buildroot}%{_prefix}/lib/zypper/commands/zypper-appstream-cache + +# Install the systemd service, which triggers when /var/cache/app-info/xmls does not yet exist during a boot +install -dm 0755 %{buildroot}%{_unitdir} +install -m 0644 appstream-sync-cache.service %{buildroot}%{_unitdir} + +%preun +%service_del_preun appstream-sync-cache.service + +%pre +%service_add_pre appstream-sync-cache.service + +%post +%service_add_post appstream-sync-cache.service + +%postun +%service_del_postun appstream-sync-cache.service + %files # zypp plugin triggering AppData update on repo refresh %dir %{_prefix}/lib/zypp %dir %{_prefix}/lib/zypp/plugins %dir %{_prefix}/lib/zypp/plugins/appdata/ -%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh +%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata +%dir %{_prefix}/lib/zypper +%dir %{_prefix}/lib/zypper/commands +%{_prefix}/lib/zypper/commands/zypper-appstream-cache %{_libexecdir}/AsHelper +%{_unitdir}/appstream-sync-cache.service %files -n openSUSE-appdata-extra %{_datadir}/appdata-extra/ diff --git a/openSUSE-appstream-1.0.1+git.20180327.tar.xz b/openSUSE-appstream-1.0.1+git.20180327.tar.xz deleted file mode 100644 index a32abf6..0000000 --- a/openSUSE-appstream-1.0.1+git.20180327.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51903357838e52702e7ba35ed25d7c5ea76f789b539141bb8432a83ab939c91a -size 91012 diff --git a/openSUSE-appstream-1.0.1+git.20180426.tar.xz b/openSUSE-appstream-1.0.1+git.20180426.tar.xz new file mode 100644 index 0000000..3992b9b --- /dev/null +++ b/openSUSE-appstream-1.0.1+git.20180426.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bbd929af050d0106d1cb6ba6e26050573d7d198721afdc087a0c47f587352ed +size 91312