diff --git a/.gitignore b/.gitignore index c4a968d..6b0fc5d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /initial-setup-0.3.26.tar.gz /initial-setup-0.3.27.tar.gz /initial-setup-0.3.28.tar.gz +/initial-setup-0.3.29.tar.gz diff --git a/initial-setup.spec b/initial-setup.spec index 884fca0..0a6fe83 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.28 +Version: 0.3.29 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to @@ -78,19 +78,25 @@ if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then echo "RUN_INITIAL_SETUP=YES" > /etc/sysconfig/initial-setup else - %systemd_post initial-setup-graphical.service %systemd_post initial-setup-text.service fi fi %preun -%systemd_preun initial-setup-graphical.service %systemd_preun initial-setup-text.service %postun -%systemd_postun_with_restart initial-setup-graphical.service %systemd_postun_with_restart initial-setup-text.service +%post gui +%systemd_post initial-setup-graphical.service + +%preun gui +%systemd_preun initial-setup-graphical.service + +%postun gui +%systemd_postun_with_restart initial-setup-graphical.service + %files -f %{name}.lang %doc COPYING README.rst %{python_sitelib}/initial_setup* @@ -108,23 +114,11 @@ fi %{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 +* Fri Feb 13 2015 Martin Kolman - 0.3.29-1 +- Split scriptlets for the gui subpackage (mkolman) +- Use /usr/bin/python2 in scripts (mkolman) + * Thu Feb 05 2015 Martin Kolman - 0.3.28-1 - Fix breakage caused by README file rename (mkolman) diff --git a/sources b/sources index e0664b5..4906486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56480fc1926307360226b106f1986593 initial-setup-0.3.28.tar.gz +664c210616285a3816264d03925e3260 initial-setup-0.3.29.tar.gz