From 762617c883e7056c9b1502f93ba1a955156df816 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Jun 08 2016 14:22:28 +0000 Subject: new version - Fix reconfiguration service name (mkolman) - Fix installation path for the reconfiguration-mode-enabled script (mkolman) - Use the environs flag when setting the environment (mkolman) - Some typo fixes and logging improvements (mkolman) - Add a systemd service that enables Initial Setup if /.unconfigured exists (#1257624) (mkolman) - Adapt to addon execute() signature change (mkolman) - Replace hardcoded python3 call by a variable (mkolman) - Nicer systemctl calls (mkolman) - Use systemd-cat also for the run-initial-setup script (mkolman) - Remove a redundant Requires: line (mkolman) - Fix a typo (mkolman) - Run correct systemd scriptlets (mkolman) - Use systemd-cat for logging to the journal (mkolman) --- diff --git a/.gitignore b/.gitignore index f16cc53..565918b 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /initial-setup-0.3.38.tar.gz /initial-setup-0.3.39.tar.gz /initial-setup-0.3.40.tar.gz +/initial-setup-0.3.41.tar.gz diff --git a/initial-setup.spec b/initial-setup.spec index 3f6ad7c..e08e11f 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,7 +1,7 @@ Summary: Initial system configuration utility Name: initial-setup URL: https://fedoraproject.org/wiki/InitialSetup -Version: 0.3.40 +Version: 0.3.41 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to @@ -13,7 +13,7 @@ Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} -%define anacondaver 24.0 +%define anacondaver 25.16 License: GPLv2+ Group: System Environment/Base @@ -45,7 +45,6 @@ Summary: Graphical user interface for the initial-setup utility Requires: gtk3 Requires: anaconda-gui >= %{anacondaver} Requires: firstboot(windowmanager) -Requires: initial-setup Requires: %{name} = %{version}-%{release} %description gui @@ -104,16 +103,16 @@ fi %systemd_post initial-setup.service %preun -%systemd_post initial-setup.service +%systemd_preun initial-setup.service %postun -%systemd_post initial-setup.service +%systemd_postun initial-setup.service %pre gui # There is a possibility that an initial setup service might be running # during package upgrade, which can together with an old version # of initial setup (<= 0.3.36) cause the rpm transaction to deadlock. -# So turn of and disable any Initial Setup services if the pre +# So turn off and disable any Initial Setup services if the pre # scriptlet is running during upgrade or package removal to prevent # the deadlock. @@ -144,7 +143,9 @@ fi %{_libexecdir}/%{name}/run-initial-setup %{_libexecdir}/%{name}/firstboot-windowmanager %{_libexecdir}/%{name}/initial-setup-text +%{_libexecdir}/%{name}/reconfiguration-mode-enabled %{_unitdir}/initial-setup.service +%{_unitdir}/initial-setup-reconfiguration.service %ifarch s390 s390x %{_sysconfdir}/profile.d/initial-setup.sh @@ -156,6 +157,21 @@ fi %{python3_sitelib}/initial_setup/gui/* %changelog +* Wed Jun 08 2016 Martin Kolman - 0.3.41-1 +- Fix reconfiguration service name (mkolman) +- Fix installation path for the reconfiguration-mode-enabled script (mkolman) +- Use the environs flag when setting the environment (mkolman) +- Some typo fixes and logging improvements (mkolman) +- Add a systemd service that enables Initial Setup if /.unconfigured exists (#1257624) (mkolman) +- Adapt to addon execute() signature change (mkolman) +- Replace hardcoded python3 call by a variable (mkolman) +- Nicer systemctl calls (mkolman) +- Use systemd-cat also for the run-initial-setup script (mkolman) +- Remove a redundant Requires: line (mkolman) +- Fix a typo (mkolman) +- Run correct systemd scriptlets (mkolman) +- Use systemd-cat for logging to the journal (mkolman) + * Thu Mar 24 2016 Martin Kolman - 0.3.40-1 - Use blank title for the Initial Setup window (mkolman) - Start the window manager correctly (#1160891) (mkolman) diff --git a/sources b/sources index 3b3b9dc..a85a4c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa3d8a6dc177affd4790f23c8bfd91c4 initial-setup-0.3.40.tar.gz +2e8234644e89ad892be5a2fd59efc241 initial-setup-0.3.41.tar.gz