Review changes and firstboot-windowmanager script

4 files changed, 23 insertions, 11 deletions

diff --git a/firstboot-windowmanager b/firstboot-windowmanager
new file mode 100755
index 0000000..ede6fa9
--- /dev/null
+++ b/firstboot-windowmanager
@@ -0,0 +1,8 @@
+#!/bin/sh
+WMS="metacity"
+for WM in $WMS; do
+    FILE=$(which $WM)
+    if [ -x "$FILE" ]; then
+        exec "$FILE" "$@"
+    fi
+done
diff --git a/initial-setup.spec b/initial-setup.spec
index 2d4938b..1d844b4 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -1,8 +1,8 @@
 Summary: Initial system configuration utility
 Name: initial-setup
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 0.1
-Release: 2%{?dist}
+Version: 0.2
+Release: 1%{?dist}
 BuildArch: noarch
 
 # This is a Red Hat maintained package which is specific to
@@ -30,14 +30,12 @@ BuildRequires: anaconda >= 18.40
 Requires: gtk3
 Requires: python
 Requires: anaconda >= 18.40
-Requires(post): systemd-units systemd-sysv chkconfig
+Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 Requires: firstboot(windowmanager)
 Requires: libreport-python
 
-%global debug_package %{nil}
-
 %description
 The initial-setup utility runs after installation.  It guides the user through
 a series of steps that allows for easier configuration of the machine.
@@ -57,8 +55,6 @@ rm -rf *.egg-info
 #%{__python} setup.py nosetests
 
 %install
-rm -rf ${buildroot}
-
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -85,10 +81,12 @@ fi
 %systemd_postun_with_restart initial-setup-xserver.service
 
 %files -f %{name}.lang
+%doc COPYING README
 %dir %{_datadir}/initial-setup/
 %dir %{_datadir}/initial-setup/modules/
 %{python_sitelib}/*
 %{_bindir}/initial-setup
+%{_bindir}/firstboot-windowmanager
 %{_datadir}/initial-setup/modules/*
 
 %{_unitdir}/initial-setup-graphical.service
@@ -96,13 +94,19 @@ fi
 %{_unitdir}/initial-setup-xserver.service
 
 %ifarch s390 s390x
-%dir %{_sysconfdir}/profile.d
 %{_sysconfdir}/profile.d/initial-setup.sh
 %{_sysconfdir}/profile.d/initial-setup.csh
 %endif
 
 
 %changelog
+* Tue Feb 13 2013 Martin Sivak <msivak@redhat.com> 0.2-1
+- Updates for package review
+- Firstboot-windowmanager script
+
+* Tue Feb 13 2013 Martin Sivak <msivak@redhat.com> 0.1-3
+- Updates for package review
+
 * Tue Jan 22 2013 Martin Sivak <msivak@redhat.com> 0.1-2
 - Updates for package review
 
diff --git a/initial_setup/Makefile b/initial_setup/Makefile
index c3919fc..35a8d98 100644
--- a/initial_setup/Makefile
+++ b/initial_setup/Makefile
@@ -17,7 +17,7 @@
 #
 # Author: Martin Sivak <msivak@redhat.com>
 
-ANACONDA_PATH=${HOME}/Work/anaconda/firstboot
+ANACONDA_PATH=${HOME}/Work/anaconda/master
 
 # GUI TESTING
 rungui:
diff --git a/setup.py b/setup.py
index 4c80c1e..6e2d9c4 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ if os.uname()[4].startswith('s390'):
 
 setup(
     name = "initial-setup",
-    version = "0.1",
+    version = "0.2",
     author = "Martin Sivak",
     author_email = "msivak@redhat.com",
     description='Post-installation configuration utility',
@@ -60,7 +60,7 @@ setup(
     package_data = {
         "": ["*.glade"]
     },
-    scripts = ["initial-setup"],
+    scripts = ["initial-setup", "firstboot-windowmanager"],
     data_files = data_files,
     setup_requires= ['nose>=1.0'],
     test_suite = "initial_setup",