[gnome-software] Depend on appstream-data for the AppStream metadata

[Richard Hughes]

commit 353a92457ac8048ff62f7b09e13e4de887bc475d
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Jun 12 13:44:46 2014 +0100

    Depend on appstream-data for the AppStream metadata

 gnome-software.spec |   14 ++++++--------
 sources             |    2 --
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/gnome-software.spec b/gnome-software.spec
index 08476bd..c893e5d 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -5,15 +5,14 @@
 Summary:   A software center for GNOME
 Name:      gnome-software
 Version:   3.13.3
-Release:   0.1.git%{shortcommit}%{?dist}
+Release:   0.2.git%{shortcommit}%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
 #Source0:   http://download.gnome.org/sources/gnome-software/3.13/%{name}-%{version}.tar.xz
 Source0:   %{name}-%{version}-%{shortcommit}.tar.xz
-Source1:   http://people.freedesktop.org/~hughsient/temp/fedora-%{?distrotag}.xml.gz
-Source2:   http://people.freedesktop.org/~hughsient/temp/fedora-%{?distrotag}-icons.tar.gz
 
+Requires:  appstream-data
 Requires:  epiphany-runtime
 Requires:  gsettings-desktop-schemas
 Requires:  PackageKit
@@ -51,9 +50,6 @@ make %{?_smp_mflags}
 
 %__rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/*.la
 
-# install AppStream data for Fedora
-DESTDIR=%{buildroot} appstream-util install %{SOURCE1} %{SOURCE2}
-
 # make the software center load faster
 desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
     --set-key=X-AppInstall-Package --set-value=%{name}
@@ -84,8 +80,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %dir %{_datadir}/gnome-software
 %{_datadir}/gnome-software/*.png
 %{_datadir}/appdata/*.appdata.xml
-%{_datadir}/app-info/xmls/*
-%{_datadir}/app-info/icons/fedora-%{?distrotag}/*.png
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/gnome-software/featured.ini
@@ -99,6 +93,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-software/modulesets.d/*.xml
 
 %changelog
+* Thu Jun 12 2014 Richard Hughes <rhughes at redhat.com> - 3.13.3-0.2.git7491627
+- Depend on the newly-created appstream-data package and stop shipping
+  the metadata here.
+
 * Sat Jun 07 2014 Kalev Lember <kalevlember at gmail.com> - 3.13.3-0.1.git7491627
 - Update to 3.13.3 git snapshot
 
diff --git a/sources b/sources
index c42d819..c1d9bf6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 c3cfc9e2ead11da01099587a7885839f  gnome-software-3.13.3-7491627.tar.xz
-dbbfad01efe0fa2866ec93e18f63f1f0  fedora-21-icons.tar.gz
-b3625ff48605f96a44539a0cb23c6dfe  fedora-21.xml.gz