From 1f8939cb53d0d202d58bcad707bedfe40b2d7d22 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 16 Apr 2013 23:11:30 -0400
Subject: [PATCH] 0.9

---
 .gitignore               |  1 +
 gnome-initial-setup.spec | 22 ++++++----------------
 sources                  |  2 +-
 yelp-fixes.patch         | 10 +++++-----
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6bafd30..2b70024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /gnome-initial-setup-0.6.tar.xz
 /gnome-initial-setup-0.7.tar.xz
 /gnome-initial-setup-0.8.tar.xz
+/gnome-initial-setup-0.9.tar.xz
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 9c3635d..9028a9d 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,6 +1,6 @@
 Name:           gnome-initial-setup
-Version:        0.8
-Release:        4%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
@@ -11,7 +11,6 @@ Source0:        http://download.gnome.org/sources/%{name}/0.8/%{name}-%{version}
 # https://bugzilla.gnome.org/show_bug.cgi?id=687957
 Patch0: yelp-fixes.patch
 Patch1: test-day-fixes.patch
-Patch2: gd-fix.patch
 
 %global nm_version 0.9
 %global glib_required_version 2.29.4
@@ -65,7 +64,6 @@ you through configuring it. It is integrated with gdm.
 %setup -q
 %patch0 -p1 -b .yelp-fixes
 %patch1 -p1 -b .test-day-fixes
-%patch2 -p1 -b .gd-fix
 
 autoreconf -i -f
 
@@ -91,17 +89,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/gnome-initial-setup
 %pre
 useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
 
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /usr/bin/systemctl enable gnome-initial-setup.service &>/dev/null || :
-fi
-
-%preun
-%systemd_preun gnome-initial-setup.service
-
 %postun
-%systemd_postun
 userdel %{name} &>/dev/null || :
 
 %files -f %{name}.lang
@@ -112,15 +100,17 @@ userdel %{name} &>/dev/null || :
 %{_libexecdir}/gnome-welcome-tour
 %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
+%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
 
 %{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
 %{_datadir}/gdm/greeter/applications/setup-shell.desktop
 %{_datadir}/gnome-session/sessions/gnome-initial-setup.session
 %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
-%{_datadir}/polkit-1/actions/org.gnome.initial-setup.policy
-/usr/lib/systemd/system/gnome-initial-setup.service
 
 %changelog
+* Tue Apr 16 2013 Matthias Clasen <mclasen@redhat.com> - 0.9-1
+- Update to 0.9
+
 * Tue Apr 16 2013 Ray Strode <rstrode@redhat.com> 0.8-4
 - Add requires for keyboard viewer app
 
diff --git a/sources b/sources
index f4bd160..ccbb287 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5dccf5805488ef44b44861807566f2d5  gnome-initial-setup-0.8.tar.xz
+56370380ff40404a7743005b5ea86aaf  gnome-initial-setup-0.9.tar.xz
diff --git a/yelp-fixes.patch b/yelp-fixes.patch
index c163edb..6c38b20 100644
--- a/yelp-fixes.patch
+++ b/yelp-fixes.patch
@@ -1,9 +1,9 @@
-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
+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
  
- /usr/libexec/gnome-initial-setup-player $intro_path/figures/gnome-yelp-intro.webm &
+ /usr/libexec/gnome-initial-setup-player $intro_path &
 -yelp help:gnome-help/getting-started
 +yelp --dont-steal-focus help:gnome-help/getting-started