From eaacfb67b6ca3f32f790d5160a06aa7d4c07816460606d08dc82190bcb7db144 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 14:03:03 +0000 Subject: [PATCH] Accepting request 581413 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581413 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libzypp-plugin-appdata?expand=0&rev=38 --- libzypp-plugin-appdata.changes | 5 +++++ libzypp-plugin-appdata.spec | 20 +++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes index f3de314..da60485 100644 --- a/libzypp-plugin-appdata.changes +++ b/libzypp-plugin-appdata.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:36:57 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Wed Oct 4 09:39:20 UTC 2017 - dleuenberger@suse.com diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec index d3d8ae2..77118e2 100644 --- a/libzypp-plugin-appdata.spec +++ b/libzypp-plugin-appdata.spec @@ -1,7 +1,7 @@ # # spec file for package libzypp-plugin-appdata # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,20 +22,20 @@ 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 +URL: https://wiki.gnome.org/Design/Apps/Software Source0: openSUSE-appstream-%{version}.tar.xz Source2: InstallAppdata.sh -BuildArch: noarch -# 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 # 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 +Requires: appstream-glib >= 0.3.6 # The script uses awk to find the right filename for the appdata.xml.gz file Requires: awk +# appdata hook was introduced in libzypp 14.29.4 +Requires: libzypp >= 14.29.4 # This is one way of providing valid appstream metadata to applications (currently the only implemented one) Provides: appstream-provider +BuildArch: noarch %description This plugin extends libzypp to install AppStream metadata, as extracted from the @@ -45,7 +45,7 @@ software centers. %package -n openSUSE-appdata-extra Summary: Additional Appstream Metadata License: CC0-1.0 -Group: System +Group: Metapackages %description -n openSUSE-appdata-extra This package contains extra appstream metadata to be used by appstream-builder @@ -61,10 +61,9 @@ install -m 0755 -d %{buildroot}%{_datadir}/appdata-extra cp appdata-extra/*/* %{buildroot}%{_datadir}/appdata-extra/ # Install AppData zypp plugin - temporarily disabled in favor of static AppStream metadata -install -Dm 0755 %{S:2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basename %{S:2}) +install -Dm 0755 %{SOURCE2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basename %{SOURCE2}) %files -%defattr(-,root,root) # zypp plugin triggering AppData update on repo refresh %dir %{_prefix}/lib/zypp %dir %{_prefix}/lib/zypp/plugins @@ -72,7 +71,6 @@ install -Dm 0755 %{S:2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basena %{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh %files -n openSUSE-appdata-extra -%defattr(-,root,root) %{_datadir}/appdata-extra/ %changelog