[gnome-initial-setup/f20] 3.10.0

[Kalev Lember]

commit a9541ad547a0b9bef7061c744990241c2c851f27
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Sep 25 15:39:27 2013 +0200

    3.10.0

 .gitignore                                         |    1 +
 ...s-goa-page-Port-to-new-async-provider-API.patch |  124 --------------------
 gnome-initial-setup.spec                           |   20 ++--
 sources                                            |    2 +-
 yelp-fixes.patch                                   |   11 +-
 5 files changed, 16 insertions(+), 142 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18fefd2..db151ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /gnome-initial-setup-0.10.tar.xz
 /gnome-initial-setup-0.11.tar.xz
 /gnome-initial-setup-0.12.tar.xz
+/gnome-initial-setup-3.10.0.tar.xz
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 47e400b..e4ae421 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,22 +1,19 @@
 Name:           gnome-initial-setup
-Version:        0.12
-Release:        7%{?dist}
+Version:        3.10.0
+Release:        1%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
 URL:            https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
-Source0:        http://download.gnome.org/sources/%{name}/0.12/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz
 
 # this depends on a yelp patch that hasn't been merged upstream yet
 # https://bugzilla.gnome.org/show_bug.cgi?id=687957
 Patch0: yelp-fixes.patch
 
-# Backported from upstream for gnome-online-accounts 3.9.90 compatibility
-Patch1: 0001-gis-goa-page-Port-to-new-async-provider-API.patch
-
-%global nm_version 0.9
-%global glib_required_version 2.29.4
-%global gtk_required_version 3.1.2
+%global nm_version 0.9.6.4
+%global glib_required_version 2.36.0
+%global gtk_required_version 3.7.11
 
 BuildRequires:  krb5-devel
 BuildRequires:  desktop-file-utils
@@ -69,7 +66,6 @@ you through configuring it. It is integrated with gdm.
 %prep
 %setup -q
 %patch0 -p1 -b .yelp-fixes
-%patch1 -p1 -b .goa
 
 autoreconf -i -f
 
@@ -99,7 +95,6 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %doc COPYING README
 %{_libexecdir}/gnome-initial-setup
 %{_libexecdir}/gnome-initial-setup-copy-worker
-%{_libexecdir}/gnome-initial-setup-player
 %{_libexecdir}/gnome-welcome-tour
 %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
@@ -112,6 +107,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
 
 %changelog
+* Wed Sep 25 2013 Kalev Lember <kalevlember at gmail.com> - 3.10.0-1
+- Update to 3.10.0
+
 * Tue Sep 03 2013 Kalev Lember <kalevlember at gmail.com> - 0.12-7
 - Rebuilt for libgnome-desktop soname bump
 
diff --git a/sources b/sources
index 69d3ab3..b7ac2c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8a3f6249ff3a12833239e4b1437e5d6  gnome-initial-setup-0.12.tar.xz
+75722a20b6852f4caebc1b5e83fcfe1a  gnome-initial-setup-3.10.0.tar.xz
diff --git a/yelp-fixes.patch b/yelp-fixes.patch
index 6c38b20..d45068c 100644
--- a/yelp-fixes.patch
+++ b/yelp-fixes.patch
@@ -1,9 +1,8 @@
-diff -up gnome-initial-setup-0.9/data/gnome-welcome-tour.yelp-fixes gnome-initial-setup-0.9/data/gnome-welcome-tour
---- gnome-initial-setup-0.9/data/gnome-welcome-tour.yelp-fixes	2013-04-16 22:52:59.180353913 -0400
-+++ gnome-initial-setup-0.9/data/gnome-welcome-tour	2013-04-16 22:53:36.737354477 -0400
-@@ -31,4 +31,4 @@ for name in $locale $lang 'C'; do
- done
+--- gnome-initial-setup-3.10.0/data/gnome-welcome-tour.yelp-fixes	2013-08-30 00:29:26.000000000 +0200
++++ gnome-initial-setup-3.10.0/data/gnome-welcome-tour	2013-09-25 15:41:22.897967924 +0200
+@@ -18,4 +18,4 @@
+ EOF
+ fi
  
- /usr/libexec/gnome-initial-setup-player $intro_path &
 -yelp help:gnome-help/getting-started
 +yelp --dont-steal-focus help:gnome-help/getting-started