From 2845c3e5da97ec6a2533d308c2f0dd9e3f07fa11 Mon Sep 17 00:00:00 2001
From: Vratislav Podzimek <vpodzime@redhat.com>
Date: Nov 20 2013 13:37:23 +0000
Subject: new version


- Fix how spokes are collected for the I-S main hub (vpodzime)
- Override distribution text in spokes (#1028370) (vpodzime)
- Get rid of the useless modules directory (vpodzime)
- Split GUI code into a separate package (#999464) (vpodzime)
- Fallback to text UI if GUI is not available (vpodzime)

---

diff --git a/.gitignore b/.gitignore
index 7b49843..3ba2789 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /initial-setup-0.3.8.tar.gz
 /initial-setup-0.3.9.tar.gz
 /initial-setup-0.3.10.tar.gz
+/initial-setup-0.3.11.tar.gz
diff --git a/initial-setup.spec b/initial-setup.spec
index dd7ea34..2a32485 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -1,7 +1,7 @@
 Summary: Initial system configuration utility
 Name: initial-setup
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 0.3.10
+Version: 0.3.11
 Release: 1%{?dist}
 BuildArch: noarch
 
@@ -13,6 +13,8 @@ BuildArch: noarch
 # git clone git://git.fedorahosted.org/initial-setup.git
 Source0: %{name}-%{version}.tar.gz
 
+%define anacondaver 21.7
+
 License: GPLv2+
 Group: System Environment/Base
 BuildRequires: gettext
@@ -25,11 +27,11 @@ BuildRequires: gtk-doc
 BuildRequires: gobject-introspection-devel
 BuildRequires: glade-devel
 BuildRequires: pygobject3
-BuildRequires: anaconda >= 20.11
+BuildRequires: anaconda >= %{anacondaver}
 BuildRequires: python-di
-Requires: gtk3
+
 Requires: python
-Requires: anaconda >= 20.11
+Requires: anaconda-tui >= %{anacondaver}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -43,6 +45,15 @@ Conflicts: firstboot < 19.2
 The initial-setup utility runs after installation.  It guides the user through
 a series of steps that allows for easier configuration of the machine.
 
+%package gui
+Summary: Graphical user interface for the initial-setup utility
+Requires: gtk3
+Requires: anaconda-gui >= %{anacondaver}
+
+%description gui
+The initial-setup-gui package contains a graphical user interface for the
+initial-setup utility.
+
 %prep
 %setup -q
 
@@ -82,14 +93,10 @@ fi
 
 %files -f %{name}.lang
 %doc COPYING README
-%dir %{_datadir}/initial-setup/
-%dir %{_datadir}/initial-setup/modules/
-%{python_sitelib}/*
+%{python_sitelib}/initial_setup*
+%exclude %{python_sitelib}/initial_setup/gui
 %{_bindir}/initial-setup
 %{_bindir}/firstboot-windowmanager
-%{_datadir}/initial-setup/modules/*
-
-%{_unitdir}/initial-setup-graphical.service
 %{_unitdir}/initial-setup-text.service
 
 %ifarch s390 s390x
@@ -97,8 +104,34 @@ fi
 %{_sysconfdir}/profile.d/initial-setup.csh
 %endif
 
+%files gui
+%{python_sitelib}/initial_setup/gui/*
+%{_unitdir}/initial-setup-graphical.service
+
+%post gui
+if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
+  platform="$(arch)"
+  if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
+    echo "RUN_INITIAL_SETUP=YES" > /etc/sysconfig/initial-setup
+  else
+    %systemd_post initial-setup-graphical.service
+  fi
+fi
+
+%preun gui
+%systemd_preun initial-setup-graphical.service
+
+%postun gui
+%systemd_postun_with_restart initial-setup-graphical.service
 
 %changelog
+* Wed Nov 20 2013 Vratislav Podzimek <vpodzime@redhat.com> - 0.3.11-1
+- Fix how spokes are collected for the I-S main hub (vpodzime)
+- Override distribution text in spokes (#1028370) (vpodzime)
+- Get rid of the useless modules directory (vpodzime)
+- Split GUI code into a separate package (#999464) (vpodzime)
+- Fallback to text UI if GUI is not available (vpodzime)
+
 * Tue Nov 05 2013 Vratislav Podzimek <vpodzime@redhat.com> - 0.3.10-1
 - Do not try to kill unexisting process (vpodzime)
 - Add some logging to our shell scripts (vpodzime)
diff --git a/sources b/sources
index 8a28e4f..762aea9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ea64fe5717a2b54574034ca11102049  initial-setup-0.3.10.tar.gz
+4547daa26da8d4d9fce683bfe068aea3  initial-setup-0.3.11.tar.gz