Accepting request 259606 from GNOME:Factory

Split libzypp-plugin-appdata out of gnome-software

OBS-URL: https://build.opensuse.org/request/show/259606
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-software?expand=0&rev=14

InstallAppdata.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 Dominique Leuenberger, Amsterdam, The Netherlands
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-RPMMD=/repodata/
-YAST2=/suse/setup/descr
-
-# Cleanup existing appdata found on the system
-for list in $(find /usr/share/app-info/xmls/*.xml.gz); do
-	appdata=$(basename ${list} .xml.gz)
-	appstream-util uninstall "${appdata}" 2>&1 > /dev/null
-done
-
-# 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/app-icons.tar.gz" 2>&1 > /dev/null
-		  ;;
-	  *)
-		  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/*
-

gnome-software.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 30 10:24:58 UTC 2014 - dimstar@opensuse.org
+
+- Split libzypp-plugin-appdata out of gnome-software to be able to
+  easier maintain updates.
+
 -------------------------------------------------------------------
 Mon Oct 13 18:14:32 UTC 2014 - zaitor@opensuse.org
 

gnome-software.spec

@@ -25,7 +25,6 @@ License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            https://wiki.gnome.org/Design/Apps/Software
 Source:         http://download.gnome.org/sources/gnome-software/3.14/%{name}-%{version}.tar.xz
-Source1:        InstallAppdata.sh
 # PATCH-FEATURE-OPENSUSE gnome-software-PK-updates.patch dimstar@opensuse.org -- Switch to PackageKit Update provider instead of systemd offline updates.
 Patch0:         gnome-software-PK-updates.patch
 # PATCH-FEATURE-OPENSUSE gnome-software-add-default-yast-appfolder.patch boo#897713 badshah400@gmail.com -- Adds a YaST app-folder by default, in addition to existing app-folders Sundry and Utilities
@@ -35,7 +34,7 @@ Patch100:       gnome-software-nouser-proxy.patch
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  suse-xsl-stylesheets
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(appstream-glib) >= 0.2.4
+BuildRequires:  pkgconfig(appstream-glib) >= 0.2.6
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.11.5
@@ -52,22 +51,6 @@ Requires:       libzypp-plugin-appdata
 AppStore like management of Applications for your GNOME Desktop.
 
 %lang_package
-%package -n libzypp-plugin-appdata
-Version:        1.0
-Release:        0
-Summary:        Extend libzypp to handle AppStream metadata
-Group:          System/Libraries
-BuildArch:      noarch
-Requires:       appstream-glib >= 0.2.4
-# appdata hook was introduced in libzypp 14.29.4
-Requires:       libzypp >= 14.29.4
-
-%description -n libzypp-plugin-appdata
-This plugin extends libzypp to install AppStream metadata, as extracted from the
-repository metadata, onto the file system in order to be picked up by
-software centers.
-
-At this moment, gnome-software is the only known implementation making use of it.
 
 %prep
 %setup -q
@@ -84,8 +67,6 @@ make %{?_smp_mflags}
 %install
 %make_install
 find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
-# Install AppData zypp plugin
-install -Dm 0755 %{S:1} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basename %{S:1})
 #suse_update_desktop_file gnome-software
 %find_lang %{name}
 
@@ -122,14 +103,6 @@ install -Dm 0755 %{S:1} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basena
 #{_libexecdir}/gnome-software-service
 %{_mandir}/man1/%{name}.1%{?ext_man}
 %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
-# zypp plugin triggering AppData update on repo refresh
-%dir %{_prefix}/lib/zypp
-%dir %{_prefix}/lib/zypp/plugins
-%dir %{_prefix}/lib/zypp/plugins/appdata/
-
-%files -n libzypp-plugin-appdata
-%defattr(-,root,root)
-%{_prefix}/lib/zypp/plugins/appdata/InstallAppdata.sh
 
 %files lang -f %{name}.lang