Accepting request 418290 from home:msmeissn:branches:Base:System

- reverted the systemctl split-off on request of Franck Bui.

- reverted the systemctl split-off on request of Franck Bui.

OBS-URL: https://build.opensuse.org/request/show/418290
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=945

systemd-mini.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com
+
+- reverted the systemctl split-off on request of Franck Bui.
+
 -------------------------------------------------------------------
 Fri Jul 29 11:49:39 UTC 2016 - jengelh@inai.de
 
@@ -9,7 +14,7 @@ Tue Jul 26 11:07:25 UTC 2016 - jengelh@inai.de
 - Split systemctl and tmpfiles into a separate package
 
 -------------------------------------------------------------------
-Tue Jul 19 17:45:12 UTC 2016 - develop7@develop7.info
+Tue Jul 19 17:42:45 UTC 2016 - develop7@develop7.info
 
 - Fix 1099-Add-default-rules-for-valve-steam-controller-to-work.patch 
   to enable missing functionality of Steam Controller

systemd-mini.spec

@@ -114,7 +114,6 @@ Requires:       netcfg
 Requires:       pam-config >= 0.79-5
 BuildRequires:  pam-config >= 0.79-5
 Requires:       pwdutils
-Requires:       systemctl = %version-%release
 Requires:       systemd-presets-branding
 Requires:       sysvinit-tools
 Requires:       util-linux >= 2.27.1
@@ -388,18 +387,6 @@ This library provides several of the systemd C APIs:
 * sd-login(3): APIs to introspect and monitor seat, login session and
   user status information on the local system.
 
-%package -n systemctl
-Summary:        systemd essential helper programs
-License:        LGPL-2.1+
-Group:          System/Base
-
-%description -n systemctl
-This subpackage contains the utilities "systemctl", "tmpfiles" and
-"sysusers", factored out to support RPM scriptlets making use of
-these. It is meant for container/chroot directories for which the
-administrator intends not to use systemd as init system while still
-maintaining the /etc/systemd symlinks links for a later time.
-
 %package -n udev%{?mini}
 Summary:        A rule-based device node and kernel event manager
 License:        GPL-2.0
@@ -1168,6 +1155,7 @@ exit 0
 %defattr(-,root,root)
 /bin/systemd
 /bin/systemd-ask-password
+/bin/systemctl
 %if %{with networkd}
 %{_bindir}/networkctl
 %endif
@@ -1179,12 +1167,14 @@ exit 0
 %if ! 0%{?bootstrap}
 %{_bindir}/machinectl
 %endif
+%{_bindir}/systemctl
 %{_bindir}/systemd-analyze
 %{_bindir}/coredumpctl
 %{_bindir}/systemd-delta
 %{_bindir}/systemd-escape
 %{_bindir}/systemd-firstboot
 %{_bindir}/systemd-path
+%{_bindir}/systemd-sysusers
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-run
 %{_bindir}/systemd-journalctl
@@ -1194,6 +1184,7 @@ exit 0
 %{_bindir}/systemd-loginctl
 %{_bindir}/systemd-inhibit
 %{_bindir}/systemd-tty-ask-password-agent
+%{_bindir}/systemd-tmpfiles
 %{_bindir}/systemd-machine-id-setup
 %{_bindir}/systemd-nspawn
 %{_bindir}/systemd-stdio-bridge
@@ -1272,6 +1263,7 @@ exit 0
 %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator
 %{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
 %{_prefix}/lib/systemd/system-preset/
+%{_prefix}/lib/sysusers.d/
 /%{_lib}/security/pam_systemd.so
 %config /etc/pam.d/systemd-user
 
@@ -1286,6 +1278,10 @@ exit 0
 %dir %{_sysconfdir}/modules-load.d
 %{_libexecdir}/modules-load.d/sg.conf
 
+%dir %{_libexecdir}/tmpfiles.d
+%dir %{_sysconfdir}/tmpfiles.d
+%{_libexecdir}/tmpfiles.d/*.conf
+
 %dir %{_libexecdir}/binfmt.d
 %dir %{_sysconfdir}/binfmt.d
 
@@ -1589,15 +1585,4 @@ exit 0
 %endif
 %endif
 
-%files -n systemctl
-%defattr(-,root,root)
-/bin/systemctl
-%_bindir/systemctl
-%_bindir/systemd-sysusers
-%_bindir/systemd-tmpfiles
-%dir %_libexecdir/sysusers.d
-%dir %_sysconfdir/tmpfiles.d
-%dir %_libexecdir/tmpfiles.d
-%_libexecdir/tmpfiles.d/*.conf
-
 %changelog

systemd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com
+
+- reverted the systemctl split-off on request of Franck Bui.
+
 -------------------------------------------------------------------
 Fri Jul 29 11:49:39 UTC 2016 - jengelh@inai.de
 

systemd.spec

@@ -109,7 +109,6 @@ Requires:       netcfg
 Requires:       pam-config >= 0.79-5
 BuildRequires:  pam-config >= 0.79-5
 Requires:       pwdutils
-Requires:       systemctl = %version-%release
 Requires:       systemd-presets-branding
 Requires:       sysvinit-tools
 Requires:       util-linux >= 2.27.1
@@ -383,18 +382,6 @@ This library provides several of the systemd C APIs:
 * sd-login(3): APIs to introspect and monitor seat, login session and
   user status information on the local system.
 
-%package -n systemctl
-Summary:        systemd essential helper programs
-License:        LGPL-2.1+
-Group:          System/Base
-
-%description -n systemctl
-This subpackage contains the utilities "systemctl", "tmpfiles" and
-"sysusers", factored out to support RPM scriptlets making use of
-these. It is meant for container/chroot directories for which the
-administrator intends not to use systemd as init system while still
-maintaining the /etc/systemd symlinks for a later time.
-
 %package -n udev%{?mini}
 Summary:        A rule-based device node and kernel event manager
 License:        GPL-2.0
@@ -1163,6 +1150,7 @@ exit 0
 %defattr(-,root,root)
 /bin/systemd
 /bin/systemd-ask-password
+/bin/systemctl
 %if %{with networkd}
 %{_bindir}/networkctl
 %endif
@@ -1174,12 +1162,14 @@ exit 0
 %if ! 0%{?bootstrap}
 %{_bindir}/machinectl
 %endif
+%{_bindir}/systemctl
 %{_bindir}/systemd-analyze
 %{_bindir}/coredumpctl
 %{_bindir}/systemd-delta
 %{_bindir}/systemd-escape
 %{_bindir}/systemd-firstboot
 %{_bindir}/systemd-path
+%{_bindir}/systemd-sysusers
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-run
 %{_bindir}/systemd-journalctl
@@ -1189,6 +1179,7 @@ exit 0
 %{_bindir}/systemd-loginctl
 %{_bindir}/systemd-inhibit
 %{_bindir}/systemd-tty-ask-password-agent
+%{_bindir}/systemd-tmpfiles
 %{_bindir}/systemd-machine-id-setup
 %{_bindir}/systemd-nspawn
 %{_bindir}/systemd-stdio-bridge
@@ -1267,6 +1258,7 @@ exit 0
 %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator
 %{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
 %{_prefix}/lib/systemd/system-preset/
+%{_prefix}/lib/sysusers.d/
 /%{_lib}/security/pam_systemd.so
 %config /etc/pam.d/systemd-user
 
@@ -1281,6 +1273,10 @@ exit 0
 %dir %{_sysconfdir}/modules-load.d
 %{_libexecdir}/modules-load.d/sg.conf
 
+%dir %{_libexecdir}/tmpfiles.d
+%dir %{_sysconfdir}/tmpfiles.d
+%{_libexecdir}/tmpfiles.d/*.conf
+
 %dir %{_libexecdir}/binfmt.d
 %dir %{_sysconfdir}/binfmt.d
 
@@ -1584,15 +1580,4 @@ exit 0
 %endif
 %endif
 
-%files -n systemctl
-%defattr(-,root,root)
-/bin/systemctl
-%_bindir/systemctl
-%_bindir/systemd-sysusers
-%_bindir/systemd-tmpfiles
-%_libexecdir/sysusers.d/
-%dir %_sysconfdir/tmpfiles.d
-%dir %_libexecdir/tmpfiles.d
-%_libexecdir/tmpfiles.d/*.conf
-
 %changelog