Hello community, here is the log from the commit of package libzypp-plugin-appdata for openSUSE:Factory checked in at 2015-04-03 14:34:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp-plugin-appdata (Old) and /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp-plugin-appdata" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp-plugin-appdata/libzypp-plugin-appdata.changes 2015-03-18 13:02:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new/libzypp-plugin-appdata.changes 2015-04-03 14:34:25.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Apr 2 13:38:08 UTC 2015 - dimstar@opensuse.org + +- InstallAppdata.sh: pass --nonet to appstream-util when + validating appstream.xml.gz. + +------------------------------------------------------------------- +Tue Mar 31 13:41:00 UTC 2015 - dimstar@opensuse.org + +- InstallAppdata.sh: only install AppStream metadata, that + validates. + +------------------------------------------------------------------- +Fri Mar 20 12:55:38 UTC 2015 - dimstar@opensuse.org + +- Re-enable the actual libzypp plugin in place of shipping a static + version of appstream metadata (last updated for 13.2). We can do + this, as Tumbleweed now produces valid metadata. 3rd party repos + are not yet able to produce valid metadata it seems. + +------------------------------------------------------------------- Old: ---- openSUSE-13.2-icons.tar.gz openSUSE-13.2.xml.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-plugin-appdata.spec ++++++ --- /var/tmp/diff_new_pack.mBUwoE/_old 2015-04-03 14:34:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mBUwoE/_new 2015-04-03 14:34:28.000000000 +0200 @@ -19,7 +19,6 @@ Name: libzypp-plugin-appdata Version: 1.0.1 Release: 0 -%define gs_plugin_api 7 Summary: Extend libzypp to handle AppStream metadata License: MIT Group: System/Libraries @@ -27,13 +26,11 @@ Source0: openSUSE-appstream-1.0.tar.xz Source1: openSUSE-appstream-process Source2: InstallAppdata.sh -Source10: openSUSE-13.2.xml.gz -Source11: openSUSE-13.2-icons.tar.gz BuildArch: noarch BuildRequires: appstream-glib >= 0.2.4 BuildRequires: fdupes -# Requires appstream-glib >= 0.2.4 for appstream-util install-basename -Requires: appstream-glib >= 0.2.4 +# appstream-glib >= 0.3.6 is the first to correctly to appstream-util uninstall in /var/cache +Requires: appstream-glib > 0.3.5 # appdata hook was introduced in libzypp 14.29.4 Requires: libzypp >= 14.29.4 @@ -79,28 +76,15 @@ done # Install AppData zypp plugin - temporarily disabled in favor of static AppStream metadata -#%%install -Dm 0755 %%{S:1} %%{buildroot}%%{_prefix}/lib/zypp/plugins/appdata/$(basename %%{S:1}) -DESTDIR=%{buildroot} appstream-util install %{S:10} %{S:11} -# marker, that we do no longer have to be aggressive in cleaning up remaining metadata in pre -touch %{buildroot}%{_datadir}/app-info/.zypp_plugin-1.0.1 - -# Link the few icons that are installed with different names -%fdupes %{buildroot}%{_datadir}/app-info/icons - -%pre -# In case we come from an old version of the plugin, we ensure to clean out any dynamic cache -if [ ! -f %{_datadir}/app-info/.zypp_plugin-1.0.1 ]; then - rm -rf %{_datadir}/app-info/ -fi +install -Dm 0755 %{S:2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basename %{S:2}) %files %defattr(-,root,root) # 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 -%{_datadir}/app-info/ +%dir %{_prefix}/lib/zypp +%dir %{_prefix}/lib/zypp/plugins +%dir %{_prefix}/lib/zypp/plugins/appdata/ +%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh %files -n openSUSE-appstream-process %defattr(-,root,root) ++++++ InstallAppdata.sh ++++++ --- /var/tmp/diff_new_pack.mBUwoE/_old 2015-04-03 14:34:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mBUwoE/_new 2015-04-03 14:34:28.000000000 +0200 @@ -26,7 +26,7 @@ YAST2=/suse/setup/descr # Cleanup existing appdata found on the system -for list in $(find /var/cache/app-info/xmls/*.xml.gz); do +for list in $(find /var/cache/app-info/xmls/*.xml.gz 2> /dev/null); do appdata=$(basename ${list} .xml.gz) appstream-util uninstall "${appdata}" 2>&1 > /dev/null done @@ -34,18 +34,22 @@ # Install new appdata files while ([ "$1" = "-R" ]); do case $4 in - rpm-md) - appstream-util install-origin "$2" $6$RPMMD/*appdata.xml.gz $6$RPMMD/*app-icons.tar.gz 2>&1 > /dev/null - ;; - yast2) - appstream-util install-origin "$2" "$6$YAST2/appdata.xml.gz" "$6$YAST2/appdata-icons.tar.gz" 2>&1 > /dev/null - ;; - *) - echo "unknown repo type - Appstream data not considered" + rpm-md) + if appstream-util validate-relax --nonet "$6$RPMMD/*appdata.xml.gz" 2>&1 > /dev/null; then + appstream-util install-origin "$2" "$6$RPMMD/*appdata.xml.gz" $6$RPMMD/*app-icons.tar.gz 2>&1 > /dev/null + fi + ;; + yast2) + if appstream-util validate-relax --nonet "$6$YAST2/appdata.xml.gz" 2>&1 > /dev/null; then + appstream-util install-origin "$2" "$6$YAST2/appdata.xml.gz" "$6$YAST2/appdata-icons.tar.gz" 2>&1 > /dev/null + fi + ;; + *) + echo "unknown repo type - Appstream data not considered" esac shift 6 done # Fixup icon that might have uncompressed with odd permissions -chmod 755 /usr/share/app-info/icons/* +chmod 755 /var/cache/app-info/icons/* ++++++ openSUSE-appstream-1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libzypp-plugin-appdata/openSUSE-appstream-1.0.tar.xz /work/SRC/openSUSE:Factory/.libzypp-plugin-appdata.new/openSUSE-appstream-1.0.tar.xz differ: char 26, line 1