More fixes for package review and s390 variable rename (typo)

5 files changed, 17 insertions, 18 deletions

diff --git a/initial-setup.spec b/initial-setup.spec
index a83c48a..2d4938b 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -2,7 +2,7 @@ Summary: Initial system configuration utility
 Name: initial-setup
 URL: http://fedoraproject.org/wiki/FirstBoot
 Version: 0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildArch: noarch
 
 # This is a Red Hat maintained package which is specific to
@@ -10,12 +10,11 @@ BuildArch: noarch
 #
 # The source is thus available only from within this SRPM
 # or via direct git checkout:
-# git clone http://
+# git clone git://fedorapeople.org/home/fedora/msivak/public_git/firstboot2.git
 Source0: %{name}-%{version}.tar.gz
 
 License: GPLv2+
 Group: System Environment/Base
-ExclusiveOS: Linux
 BuildRequires: gettext
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
@@ -27,6 +26,7 @@ BuildRequires: gobject-introspection-devel
 BuildRequires: glade-devel
 BuildRequires: pygobject3
 BuildRequires: python-babel
+BuildRequires: anaconda >= 18.40
 Requires: gtk3
 Requires: python
 Requires: anaconda >= 18.40
@@ -52,8 +52,9 @@ rm -rf *.egg-info
 %{__python} setup.py build
 %{__python} setup.py compile_catalog -D %{name} -d locale
 
-%check
-%{__python} setup.py nosetests
+# Check is disabled until Gtk bug rhbz#902401 is resolved
+#%check
+#%{__python} setup.py nosetests
 
 %install
 rm -rf ${buildroot}
@@ -65,7 +66,7 @@ rm -rf ${buildroot}
 if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
   platform="$(arch)"
   if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
-    echo "RUN_INITAL_SETUP=YES" > /etc/sysconfig/initial-setup
+    echo "RUN_INITIAL_SETUP=YES" > /etc/sysconfig/initial-setup
   else
     %systemd_post initial-setup-graphical.service
     %systemd_post initial-setup-text.service
@@ -74,10 +75,6 @@ if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
 fi
 
 %preun
-if [ $1 = 0 ]; then
-  rm -rf /usr/share/initial-setup/*.pyc
-  rm -rf /usr/share/initial-setup/modules/*.pyc
-fi
 %systemd_preun initial-setup-graphical.service
 %systemd_preun initial-setup-text.service
 %systemd_preun initial-setup-xserver.service
@@ -88,16 +85,15 @@ fi
 %systemd_postun_with_restart initial-setup-xserver.service
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %dir %{_datadir}/initial-setup/
 %dir %{_datadir}/initial-setup/modules/
 %{python_sitelib}/*
 %{_bindir}/initial-setup
 %{_datadir}/initial-setup/modules/*
 
-/lib/systemd/system/initial-setup-graphical.service
-/lib/systemd/system/initial-setup-text.service
-/lib/systemd/system/initial-setup-xserver.service
+%{_unitdir}/initial-setup-graphical.service
+%{_unitdir}/initial-setup-text.service
+%{_unitdir}/initial-setup-xserver.service
 
 %ifarch s390 s390x
 %dir %{_sysconfdir}/profile.d
@@ -107,5 +103,8 @@ fi
 
 
 %changelog
+* Tue Jan 22 2013 Martin Sivak <msivak@redhat.com> 0.1-2
+- Updates for package review
+
 * Tue Nov 06 2012 Martin Sivak <msivak@redhat.com> 0.1-1
-- Inital release
+- Initial release
diff --git a/modules/README.txt b/modules/README.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/modules/README.txt
diff --git a/scripts/initial-setup.csh b/scripts/initial-setup.csh
index 8ea1975..9934bdf 100644
--- a/scripts/initial-setup.csh
+++ b/scripts/initial-setup.csh
@@ -4,7 +4,7 @@ set IS_EXEC = /usr/sbin/initial-setup
 set IS_CONF = /etc/sysconfig/initial-setup
 
 # check if we should run firstboot
-grep -i "RUN_INITAL_SETUP=NO" $IS_CONF >/dev/null
+grep -i "RUN_INITIAL_SETUP=NO" $IS_CONF >/dev/null
 if (( $? != 0 ) && ( -x $IS_EXEC )) then
     # check if we're not on 3270 terminal and root
     if (( `/sbin/consoletype` == "pty" ) && ( `/usr/bin/id -u` == 0 )) then
diff --git a/scripts/initial-setup.sh b/scripts/initial-setup.sh
index 511e70c..18a2028 100644
--- a/scripts/initial-setup.sh
+++ b/scripts/initial-setup.sh
@@ -7,7 +7,7 @@ IS_CONF=/etc/sysconfig/initial-setup
 [ -f $IS_CONF ] && . $IS_CONF
 
 # check if we should run firstboot
-if [ -f $IS_EXEC ] && [ "${RUN_INITAL_SETUP,,}" = "yes" ]; then
+if [ -f $IS_EXEC ] && [ "${RUN_INITIAL_SETUP,,}" = "yes" ]; then
     # check if we're not on 3270 terminal and root
     if [ $(/sbin/consoletype) = "pty" ] && [ $EUID -eq 0 ]; then
         args=""
diff --git a/setup.py b/setup.py
index 9f513b6..4c80c1e 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-data_files = [('/lib/systemd/system', glob('systemd/*.service')),
+data_files = [('/usr/lib/systemd/system', glob('systemd/*.service')),
               ('/usr/share/initial-setup/modules', glob('modules/*'))]
 
 # add localization files