From d9325f8d71dcf4c5c82aeb064a662fe9e3a75b04 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Dec 01 2015 13:32:13 +0000 Subject: new version - Make Initial Setup startup more robust (mkolman) - Move the s390 profile scripts to a subfolder (mkolman) - Improve log messages for kickstart parsing error (mkolman) --- diff --git a/.gitignore b/.gitignore index a2ea888..9473603 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /initial-setup-0.3.35.tar.gz /initial-setup-0.3.36.tar.gz /initial-setup-0.3.37.tar.gz +/initial-setup-0.3.38.tar.gz diff --git a/initial-setup.spec b/initial-setup.spec index 01b55e1..7e2e256 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,8 +1,8 @@ Summary: Initial system configuration utility Name: initial-setup URL: https://fedoraproject.org/wiki/InitialSetup -Version: 0.3.37 -Release: 3%{?dist} +Version: 0.3.38 +Release: 1%{?dist} # This is a Red Hat maintained package which is specific to # our distribution. @@ -101,13 +101,13 @@ if [ $1 -gt 1 ] ; then fi %post -%systemd_post initial-setup-text.service +%systemd_post initial-setup.service %preun -%systemd_preun initial-setup-text.service +%systemd_post initial-setup.service %postun -%systemd_postun initial-setup-text.service +%systemd_post initial-setup.service %pre gui # There is a possibility that an initial setup service might be running @@ -136,22 +136,14 @@ if [ $1 -gt 1 ] ; then fi fi -%post gui -%systemd_post initial-setup-graphical.service - -%preun gui -%systemd_preun initial-setup-graphical.service - -%postun gui -%systemd_postun initial-setup-graphical.service - %files -f %{name}.lang %doc COPYING README.rst %{python3_sitelib}/initial_setup* %exclude %{python3_sitelib}/initial_setup/gui -%{_bindir}/initial-setup -%{_bindir}/firstboot-windowmanager -%{_unitdir}/initial-setup-text.service +%{_libexecdir}/%{name}/run-initial-setup +%{_libexecdir}/%{name}/firstboot-windowmanager +%{_libexecdir}/%{name}/initial-setup-text +%{_unitdir}/initial-setup.service %ifarch s390 s390x %{_sysconfdir}/profile.d/initial-setup.sh @@ -159,15 +151,14 @@ fi %endif %files gui +%{_libexecdir}/%{name}/initial-setup-graphical %{python3_sitelib}/initial_setup/gui/* -%{_unitdir}/initial-setup-graphical.service %changelog -* Tue Nov 10 2015 Fedora Release Engineering - 0.3.37-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Nov 05 2015 Martin Kolman - 0.3.37-2 -- Rebuild for Python 3.5 (mkolman) +* Tue Dec 01 2015 Martin Kolman - 0.3.38-1 +- Make Initial Setup startup more robust (mkolman) +- Move the s390 profile scripts to a subfolder (mkolman) +- Improve log messages for kickstart parsing error (mkolman) * Wed Sep 30 2015 Martin Kolman - 0.3.37-1 - Stop any Initial Setup services before upgrading package (#1244394) (mkolman) diff --git a/sources b/sources index b6e8fb0..7eb2753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46f94c9e1a1424d62c2a7350519b7572 initial-setup-0.3.37.tar.gz +7d6c41607adf9722c35c73821cc8d29a initial-setup-0.3.38.tar.gz