From 6362b69c4b47fb6ff67b6498398470c79439f675afcfa9cf7f702a5c1c60290a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 27 Mar 2015 15:04:50 +0000 Subject: [PATCH] - 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. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libzypp-plugin-appdata?expand=0&rev=13 --- InstallAppdata.sh | 4 ++-- _service | 2 +- libzypp-plugin-appdata.changes | 8 +++++++ libzypp-plugin-appdata.spec | 32 +++++++------------------- openSUSE-13.2-icons.tar.gz | 3 --- openSUSE-13.2.xml.gz | 3 --- openSUSE-appstream-1.0.20150320.tar.xz | 3 +++ openSUSE-appstream-1.0.tar.xz | 3 --- 8 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 openSUSE-13.2-icons.tar.gz delete mode 100644 openSUSE-13.2.xml.gz create mode 100644 openSUSE-appstream-1.0.20150320.tar.xz delete mode 100644 openSUSE-appstream-1.0.tar.xz diff --git a/InstallAppdata.sh b/InstallAppdata.sh index b8793b9..6def0b1 100644 --- a/InstallAppdata.sh +++ b/InstallAppdata.sh @@ -26,7 +26,7 @@ RPMMD=/repodata/ 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 @@ -47,5 +47,5 @@ while ([ "$1" = "-R" ]); do done # Fixup icon that might have uncompressed with odd permissions -chmod 755 /usr/share/app-info/icons/* +chmod 755 /var/cache/app-info/icons/* diff --git a/_service b/_service index 63ea02b..651cc31 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/DimStar77/openSUSE-appstream.git git - 1.0 + 1.0.%cd *.tar diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes index 56b6d25..e08dbf5 100644 --- a/libzypp-plugin-appdata.changes +++ b/libzypp-plugin-appdata.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Tue Mar 17 13:14:07 UTC 2015 - dimstar@opensuse.org diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec index c9117b4..a7faa77 100644 --- a/libzypp-plugin-appdata.spec +++ b/libzypp-plugin-appdata.spec @@ -19,21 +19,18 @@ 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 Url: https://wiki.gnome.org/Design/Apps/Software -Source0: openSUSE-appstream-1.0.tar.xz +Source0: openSUSE-appstream-1.0.20150320.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.6 # appdata hook was introduced in libzypp 14.29.4 Requires: libzypp >= 14.29.4 @@ -79,28 +76,15 @@ do 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) diff --git a/openSUSE-13.2-icons.tar.gz b/openSUSE-13.2-icons.tar.gz deleted file mode 100644 index b1689d8..0000000 --- a/openSUSE-13.2-icons.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c53600f9962f550caf048389dbf4d0ee14ddb0bd7a72c18cf1802182c334296 -size 6638666 diff --git a/openSUSE-13.2.xml.gz b/openSUSE-13.2.xml.gz deleted file mode 100644 index fab4e23..0000000 --- a/openSUSE-13.2.xml.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed20423e950735bcf086e0815455235268f3f8c372c146b26bb108fa0bd743fe -size 1034417 diff --git a/openSUSE-appstream-1.0.20150320.tar.xz b/openSUSE-appstream-1.0.20150320.tar.xz new file mode 100644 index 0000000..65ab89e --- /dev/null +++ b/openSUSE-appstream-1.0.20150320.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f118f48c04660f686be401a20366ee00577ee3cdb4e084812bedc1c2aca5e723 +size 40672852 diff --git a/openSUSE-appstream-1.0.tar.xz b/openSUSE-appstream-1.0.tar.xz deleted file mode 100644 index 8230663..0000000 --- a/openSUSE-appstream-1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ea8aac8fc927c1d1183109188f6f278317bb7325b1a54b383ba5845e17f86f4 -size 40672140