[gnome-software/f20-gnome-3-12] Update to 3.12.1

[Richard Hughes]

commit 55dac3c3dfb03ed0ebdc455ff5206c7337aa2023
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Apr 14 15:16:29 2014 +0100

    Update to 3.12.1

 .gitignore                                         |    1 +
 ...g-pending-apps-more-than-once-to-the-inst.patch |   33 -------
 ...PluginLoaderFinishedFunc-in-the-main-thre.patch |   94 --------------------
 gnome-software.spec                                |   60 ++++++++-----
 sources                                            |    6 +-
 5 files changed, 40 insertions(+), 154 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac14e1a..77f80ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /gnome-software-3.10.2.tar.xz
 /gnome-software-3.10.3.tar.xz
 /gnome-software-3.10.4.tar.xz
+/gnome-software-3.12.1.tar.xz
diff --git a/gnome-software.spec b/gnome-software.spec
index 890b587..27750b1 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -1,17 +1,17 @@
+%define distrotag                       rawhide
+
 Summary:   A software center for GNOME
 Name:      gnome-software
-Version:   3.10.4
-Release:   2%{?dist}
+Version:   3.12.1
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
 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
-
-Patch5:    0001-Avoid-adding-pending-apps-more-than-once-to-the-inst.patch
-Patch6:    0001-Call-the-GsPluginLoaderFinishedFunc-in-the-main-thre.patch
+Source1:   http://people.freedesktop.org/~hughsient/temp/fedora-%{?distrotag}.xml.gz
+Source2:   http://people.freedesktop.org/~hughsient/temp/fedora-%{?distrotag}-icons.tar.gz
 
+Requires:  epiphany-runtime
 Requires:  PackageKit
 Requires:  gnome-icon-theme
 Requires:  gnome-icon-theme-symbolic >= 3.10.1
@@ -21,10 +21,16 @@ BuildRequires: intltool
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 BuildRequires: desktop-file-utils
-BuildRequires: glib2-devel >= 2.25.9-2
+BuildRequires: glib2-devel >= 2.39.1
 BuildRequires: gtk3-devel >= 3.9.12
 BuildRequires: libnotify-devel
 BuildRequires: PackageKit-glib-devel >= 0.8.10
+BuildRequires: libsoup-devel
+BuildRequires: gnome-desktop3-devel
+BuildRequires: gsettings-desktop-schemas-devel
+
+# this is not a library version
+%define gs_plugin_version               3
 
 %description
 gnome-software is an application that makes it easy to add, remove
@@ -32,8 +38,6 @@ and update software in the GNOME desktop.
 
 %prep
 %setup -q
-%patch5 -p1 -b .visual
-%patch6 -p1 -b .crash
 
 %build
 %configure
@@ -42,23 +46,27 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-%__rm %{buildroot}%{_libdir}/gs-plugins/*.a
-%__rm %{buildroot}%{_libdir}/gs-plugins/*.la
+%__rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/*.a
+%__rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/*.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
+%__mkdir_p %{buildroot}%{_datadir}/app-info/icons/fedora-%{?distrotag}
+cd %{buildroot}%{_datadir}/app-info/icons/fedora-%{?distrotag}
 %__tar xvzf %{SOURCE2}
 cd -
 
+# make the software center load faster
+desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \
+    --set-key=X-AppInstall-Package --set-value=%{name}
+
 %find_lang %name --with-gnome
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-software.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -77,23 +85,27 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %files -f %{name}.lang
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gnome-software
-%{_datadir}/applications/gnome-software.desktop
+%{_datadir}/applications/*.desktop
 %dir %{_datadir}/gnome-software
 %{_datadir}/gnome-software/*.png
 %{_datadir}/appdata/*.appdata.xml
-%{_datadir}/app-info/xmls/*.gz
-%{_datadir}/app-info/icons/*.png
+%{_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
-%dir %{_libdir}/gs-plugins
-%{_libdir}/gs-plugins/*.so
+%dir %{_libdir}/gs-plugins-%{gs_plugin_version}
+%{_libdir}/gs-plugins-%{gs_plugin_version}/*.so
+%{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
+%{_datadir}/dbus-1/services/org.gnome.Software.service
+%{_datadir}/gnome-shell/search-providers/gnome-software-search-provider.ini
+%{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml
+%dir %{_datadir}/gnome-software/modulesets.d
+%{_datadir}/gnome-software/modulesets.d/*.xml
 
 %changelog
-* Tue Jan 07 2014 Richard Hughes <rhughes at redhat.com> - 3.10.4-2
-- Backport two patches from master to avoid a visual glitch and possible crash
-  when installing or removing.
-- Resolves: #1044237
+* Mon Apr 14 2014 Richard Hughes <rhughes at redhat.com> - 3.12.1-1
+- Update to 3.12.1
 
 * Mon Nov 25 2013 Richard Hughes <rhughes at redhat.com> - 3.10.4-1
 - Update to 3.10.4
diff --git a/sources b/sources
index 9220898..3a9ec1e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-97094fcc0d9f40fc86b5088b5a300b63  gnome-software-3.10.4.tar.xz
-db6e38efddab63386f7902353de2881d  fedora-20.xml.gz
-696c7e000b81c5ebd0e82786062b68a2  fedora-20-icons.tar.gz
+8ecf44b53be80fe2258f37088914bd93  gnome-software-3.12.1.tar.xz
+4c0b06f376025976ae433c9d6b38c506  fedora-rawhide-icons.tar.gz
+9ea615a0b7a0924008863183822b91de  fedora-rawhide.xml.gz