[gnome-initial-setup/f19] 0.7

[Matthias Clasen]

commit 423fd2480a2a2ca25a8a82718699e65bdb6d497e
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Mar 14 08:52:36 2013 -0400

    0.7

 gnome-initial-setup.spec |   17 ++++++++++++++---
 libgd-static.patch       |   12 ++++++++++++
 yelp-fixes.patch         |   12 ++++++------
 3 files changed, 32 insertions(+), 9 deletions(-)
---
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index a893138..836d1a4 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,16 +1,19 @@
 Name:           gnome-initial-setup
-Version:        0.6
-Release:        4%{?dist}
+Version:        0.7
+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.6/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/%{name}/0.7/%{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
 
+# upstream fix
+Patch1: libgd-static.patch
+
 %global nm_version 0.9
 %global glib_required_version 2.29.4
 %global gtk_required_version 3.1.2
@@ -40,6 +43,8 @@ BuildRequires:  pkgconfig(gio-unix-2.0) >= %{glib_required_version}
 BuildRequires:  pkgconfig(gdm)
 BuildRequires:  pkgconfig(iso-codes)
 BuildRequires:  krb5-devel
+BuildRequires:  autoconf automake libtool
+BuildRequires:  gnome-common
 
 # gnome-initial-setup is being run by gdm
 Requires: gdm
@@ -60,6 +65,9 @@ you through configuring it. It is integrated with gdm.
 %prep
 %setup -q
 %patch0 -p1 -b .yelp-fixes
+%patch1 -p1 -b .libgd-static
+
+autoreconf -i -f
 
 %build
 %configure
@@ -113,6 +121,9 @@ userdel %{name} &>/dev/null || :
 /usr/lib/systemd/system/gnome-initial-setup.service
 
 %changelog
+* Tue Mar 12 2013 Matthias Clasen <mclasen at redhat.com> - 0.7-1
+- Update to 0.7
+
 * Thu Feb 21 2013 Kalev Lember <kalevlember at gmail.com> - 0.6-4
 - Rebuilt for cogl soname bump
 
diff --git a/libgd-static.patch b/libgd-static.patch
new file mode 100644
index 0000000..8c8dbc2
--- /dev/null
+++ b/libgd-static.patch
@@ -0,0 +1,12 @@
+diff -up gnome-initial-setup-0.7/configure.ac.libgd gnome-initial-setup-0.7/configure.ac
+--- gnome-initial-setup-0.7/configure.ac.libgd	2013-03-12 22:03:55.313322479 -0400
++++ gnome-initial-setup-0.7/configure.ac	2013-03-12 22:04:04.793323025 -0400
+@@ -92,7 +92,7 @@ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
+ ISO_CODES=iso-codes
+ 
+-LIBGD_INIT([stack])
++LIBGD_INIT([stack static])
+ 
+ # systemd
+ AC_ARG_WITH([systemdsystemunitdir],
diff --git a/yelp-fixes.patch b/yelp-fixes.patch
index 38d7f4a..c163edb 100644
--- a/yelp-fixes.patch
+++ b/yelp-fixes.patch
@@ -1,9 +1,9 @@
-diff -up gnome-initial-setup-0.6/data/gnome-welcome-tour.yelp-fixes gnome-initial-setup-0.6/data/gnome-welcome-tour
---- gnome-initial-setup-0.6/data/gnome-welcome-tour.yelp-fixes	2013-01-16 22:29:48.163401459 -0500
-+++ gnome-initial-setup-0.6/data/gnome-welcome-tour	2013-01-16 22:32:12.545396298 -0500
+diff -up gnome-initial-setup-0.7/data/gnome-welcome-tour.yelp-fixes gnome-initial-setup-0.7/data/gnome-welcome-tour
+--- gnome-initial-setup-0.7/data/gnome-welcome-tour.yelp-fixes	2013-03-12 21:19:04.153167486 -0400
++++ gnome-initial-setup-0.7/data/gnome-welcome-tour	2013-03-12 21:19:30.109168981 -0400
 @@ -25,4 +25,4 @@ for name in $locale $lang 'C'; do
  done
  
- /usr/libexec/gnome-initial-setup-player $intro_path/figures/yelp-intro.webm &
--yelp help:getting-started
-+yelp --dont-steal-focus help:getting-started
+ /usr/libexec/gnome-initial-setup-player $intro_path/figures/gnome-yelp-intro.webm &
+-yelp help:gnome-help/getting-started
++yelp --dont-steal-focus help:gnome-help/getting-started