diff --git a/_servicedata b/_servicedata index 0b5fdf5..9cf54e5 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/DimStar77/openSUSE-appstream.git - 58e1e4e128dfe67484342418afcc61efe6e592bf \ No newline at end of file + 4852b6d6bcdc33e1d8c315657e3ffb8dfbf81410 \ No newline at end of file diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes index 0619521..0f7b89b 100644 --- a/libzypp-plugin-appdata.changes +++ b/libzypp-plugin-appdata.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Mar 27 11:26:55 UTC 2018 - dimstar@opensuse.org + +- Update to version 1.0.1+git.20180327: + * AsHelper: normalize the repo alias names + +------------------------------------------------------------------- +Tue Mar 27 08:27:00 UTC 2018 - dimstar@opensuse.org + +- Start zypper lr with ZYPP_PLUGIN_APPDATA_FORCE_COLLECT=1 post + installation (boo#1009745). +- Add relevant Requires(post) to ensure packages are installed in + the right order: + + appstream-glib >= 0.3.6 + + python3-cmdln + + python3-createrepo_c + + libzypp >= 16.13.1 + + zypper + ------------------------------------------------------------------- Wed Mar 21 19:15:14 UTC 2018 - dimstar@opensuse.org diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec index 8ea83d5..43e671e 100644 --- a/libzypp-plugin-appdata.spec +++ b/libzypp-plugin-appdata.spec @@ -17,7 +17,7 @@ Name: libzypp-plugin-appdata -Version: 1.0.1+git.20180321 +Version: 1.0.1+git.20180327 Release: 0 Summary: Extend libzypp to handle AppStream metadata License: MIT AND CC0-1.0 @@ -30,9 +30,15 @@ Requires: AppStream Requires: appstream-glib >= 0.3.6 # appdata hook was introduced in libzypp 14.29.4 Requires: libzypp >= 14.29.4 -Requires: python3-cmdln # AsHelper is a python program with few dependencies +Requires: python3-cmdln Requires: python3-createrepo_c +Requires(post): appstream-glib >= 0.3.6 +# libzypp 16.13.1 was the version gaingin support for ZYPP_PLUGIN_APPDATA_FORCE_COLLECT +Requires(post): libzypp >= 16.13.1 +Requires(post): python3-cmdln +Requires(post): python3-createrepo_c +Requires(post): zypper # This is one way of providing valid appstream metadata to applications (currently the only implemented one) Provides: appstream-provider BuildArch: noarch @@ -64,6 +70,17 @@ cp appdata-extra/*/* %{buildroot}%{_datadir}/appdata-extra/ install -Dm 0755 InstallAppdata.sh %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh install -Dm 0755 AsHelper.py %{buildroot}%{_libexecdir}/AsHelper +%post +# On initial installation, we enforce an AppStream refresh +# ZYPP_PLUGIN_APPDATA_FORCE_COLLECT=1 instructs zypper to fire off the appdata plugin +# which normally would only happen on repo refresh; but for 'non-rolling' products, +# the default repos are all static and don't refresh. This would leave software centers +# in a unusable state +# Addresses https://bugzilla.opensuse.org/show_bug.cgi?id=1009745 +if [ $1 == 1 ]; then + ZYPP_PLUGIN_APPDATA_FORCE_COLLECT=1 zypper -n lr >/dev/null 2>&1 +fi + %files # zypp plugin triggering AppData update on repo refresh %dir %{_prefix}/lib/zypp diff --git a/openSUSE-appstream-1.0.1+git.20180321.tar.xz b/openSUSE-appstream-1.0.1+git.20180321.tar.xz deleted file mode 100644 index 0a97b5b..0000000 --- a/openSUSE-appstream-1.0.1+git.20180321.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d4a955125b1b5462902b5a50a31203e749c866c4160e42052166f8b91dd77c8 -size 90984 diff --git a/openSUSE-appstream-1.0.1+git.20180327.tar.xz b/openSUSE-appstream-1.0.1+git.20180327.tar.xz new file mode 100644 index 0000000..a32abf6 --- /dev/null +++ b/openSUSE-appstream-1.0.1+git.20180327.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51903357838e52702e7ba35ed25d7c5ea76f789b539141bb8432a83ab939c91a +size 91012