[gnome-software] Do not include the Fedora AppStream data in the upstream tarball

[Richard Hughes <rhughes src gnome org>]

commit c62a3f0843875fc1626ea177a1402a1aa4aae078
Author: Richard Hughes <richard hughsie com>
Date:   Thu Sep 5 09:31:45 2013 +0100

    Do not include the Fedora AppStream data in the upstream tarball

 configure.ac                   |    8 --------
 contrib/gnome-software.spec.in |   18 +++++++++++++++---
 data/Makefile.am               |   25 ++++++++++---------------
 3 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2529222..b7778e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,13 +91,6 @@ AS_IF([test "$enable_man" != no], [
 ])
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 
-# ostree doesn't have networking
-AC_ARG_ENABLE(offline-appstream-data,
-              [AS_HELP_STRING([--enable-offline-appstream-data],
-                              [ship offline appstream data [default=yes]])],,
-              enable_offline_appstream_data=yes)
-AM_CONDITIONAL(ENABLE_OFFLINE_APPSTREAM_DATA, test "$enable_offline_appstream_data" != no)
-
 dnl ---------------------------------------------------------------------------
 dnl - Makefiles, etc.
 dnl ---------------------------------------------------------------------------
@@ -117,7 +110,6 @@ echo "
 
         prefix:                    ${prefix}
         datadir:                   ${datadir}
-        Offline AppStream data:    ${enable_offline_appstream_data}
         compiler:                  ${CC}
         cflags:                    ${CFLAGS}
         cppflags:                  ${CPPFLAGS}
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 711d3a1..47c88d5 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -7,7 +7,9 @@ Release:   0.#BUILD#%{?alphatag}%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
-Source0:   http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}.tar.xz
+Source0:   http://download.gnome.org/sources/gnome-software/3.9/%{name}-%{version}.tar.xz
+Source1:   http://people.freedesktop.org/~hughsient/temp/fedora-20.xml.gz
+Source2:   http://people.freedesktop.org/~hughsient/temp/fedora-20-icons.tar.gz
 
 Requires:  gnome-icon-theme
 
@@ -34,8 +36,18 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-rm %{buildroot}%{_libdir}/gs-plugins/*.a
-rm %{buildroot}%{_libdir}/gs-plugins/*.la
+%__rm %{buildroot}%{_libdir}/gs-plugins/*.a
+%__rm %{buildroot}%{_libdir}/gs-plugins/*.la
+
+# install AppStream data for Fedora
+%__mkdir_p %{buildroot}%{_datadir}/app-info/xmls
+%__cp %{SOURCE1} %{buildroot}%{_datadir}/app-info/xmls
+
+# decompress and install AppStream icons
+%__mkdir_p %{buildroot}%{_datadir}/app-info/icons
+cd %{buildroot}%{_datadir}/app-info/icons
+%__tar xvzf %{SOURCE2}
+cd -
 
 %find_lang %name --with-gnome
 
diff --git a/data/Makefile.am b/data/Makefile.am
index eb368d1..f04b9d3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,25 +14,20 @@ dist_resources_DATA =                                       \
 appdatadir = $(datadir)/appdata
 appdata_files = gnome-software.appdata.xml
 
-if ENABLE_OFFLINE_APPSTREAM_DATA
-fedora-20.xml.gz:
-       wget -O fedora-20.xml.gz http://people.freedesktop.org/~hughsient/temp/appstream.xml.gz
-fedora-20.tar.gz:
-       wget -O fedora-20.tar.gz http://people.freedesktop.org/~hughsient/temp/appstream-icons.tar.gz
-
-appstreamxmldir = $(datadir)/app-info/xmls
-dist_appstreamxml_DATA = fedora-20.xml.gz
-appstreamiconsdir = $(datadir)/app-info/icons
-dist_appstreamicons_DATA = fedora-20.tar.gz
-endif
+install-sample-data:
+       wget -O fedora-20.xml.gz http://people.freedesktop.org/~hughsient/temp/fedora-20.xml.gz; \
+       mkdir -p $(DESTDIR)$(datadir)/app-info/xmls; \
+       cp fedora-20.xml.gz $(DESTDIR)$(datadir)/app-info/xmls/; \
+       wget -O fedora-20-icons.tar.gz http://people.freedesktop.org/~hughsient/temp/fedora-20-icons.tar.gz; \
+       cp fedora-20-icons.tar.gz $(DESTDIR)$(datadir)/app-info/icons; \
+       cd $(DESTDIR)$(datadir)/app-info/icons; \
+       tar xvzf fedora-20-icons.tar.gz &> /dev/null; \
+       rm fedora-20-icons.tar.gz; \
+       cd -
 
 EXTRA_DIST =                                           \
        $(appdata_files)
 
-CLEANFILES =                                           \
-       $(dist_appstreamxml_DATA)                       \
-       $(dist_appstreamicons_DATA)
-
 MAINTAINERCLEANFILES =                                 \
        *~                                              \
        Makefile.in