From fd650075ec5f32a6e868d223768ac72f3ddec948 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 18 Oct 2012 22:51:58 -0400
Subject: [PATCH] 0.3

---
 .gitignore               |  1 +
 gnome-initial-setup.spec | 37 ++++++++++++++++++++++++++++++-------
 sources                  |  2 +-
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index dfdee0e..c749c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gnome-initial-setup-0.2.tar.xz
+/gnome-initial-setup-0.3.tar.xz
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index fe97e0d..dd9b1a9 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -1,11 +1,11 @@
 Name:           gnome-initial-setup
-Version:        0.2
-Release:        2%{?dist}
+Version:        0.3
+Release:        1%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
 URL:            https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
-Source0:        http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.xz
+Source0:        http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.xz
 
 %global nm_version 0.9
 %global glib_required_version 2.29.4
@@ -36,6 +36,10 @@ BuildRequires:  pkgconfig(iso-codes)
 # gnome-initial-setup is being run by gdm
 Requires: gdm
 
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
 %description
 GNOME Initial Setup is an alternative to firstboot, providing
 a good setup experience to welcome you to your system, and walks
@@ -55,27 +59,46 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 # Desktop file does not (and probably will not) ever validate, as it uses
 # an absolute path /tmp/-style trigger to determine whether to autostart.
-# desktop-file-validate %%{buildroot}/%%{_sysconfdir}/xdg/autostart/welcome-tour.desktop
+# desktop-file-validate %%{buildroot}/%%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/gnome-initial-setup/applications/gnome-initial-setup.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/gdm/greeter/applications/setup-shell.desktop
 
 %find_lang %{name}
 
+%post
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+    /usr/bin/systemctl enable gnome-initial-setup.service >/dev/null 2>&1 || :
+fi
+
+%preun
+%systemd_preun gnome-initial-setup.service
+
+%postun
+%systemd_postun
+
 %files -f %{name}.lang
 %doc COPYING README
 %{_libexecdir}/gnome-initial-setup
 %{_libexecdir}/gnome-initial-setup-copy-worker
-%{_sysconfdir}/xdg/autostart/welcome-tour.desktop
+%{_libexecdir}/gnome-welcome-tour
+%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 
 %dir %{_datadir}/gnome-initial-setup
-%{_datadir}/gnome-initial-setup/applications/gnome-initial-setup.desktop
 %{_datadir}/gnome-initial-setup/20-gnome-initial-setup.rules
 
+%{_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/actions/org.gnome.initial-setup.policy
+/usr/lib/systemd/system/gnome-initial-setup.service
 
 %changelog
+* Thu Oct 18 2012 Matthias Clsaen <mclasen@redhat.com> - 0.3-1
+- 0.3
+
 * Fri Sep 14 2012 Matthias Clasen <mclasen@redhat.com> - 0.2-2
 - Add Requires: gdm
 
diff --git a/sources b/sources
index 114829b..b5bcd4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8bb68e09e0ab64500858c6e93a84ae9  gnome-initial-setup-0.2.tar.xz
+e20c411d08788f1c2e0431169287dee9  gnome-initial-setup-0.3.tar.xz