From c87ab91a9bdd70f2b800ca1fda4b2278c6b43e26d118d42541ca4522d8a10386 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 4 Aug 2016 11:43:47 +0000
Subject: [PATCH] Accepting request 415958 from
 home:jengelh:branches:Base:System

- Add sysusers to the new split "systemctl" subpackage

OBS-URL: https://build.opensuse.org/request/show/415958
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=943
---
 systemd-mini.changes |  5 +++++
 systemd-mini.spec    | 12 ++++++------
 systemd.changes      |  5 +++++
 systemd.spec         | 12 ++++++------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index 4a519473..4968fe94 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 29 11:49:39 UTC 2016 - jengelh@inai.de
+
+- Add sysusers to the new split "systemctl" subpackage
+
 -------------------------------------------------------------------
 Tue Jul 26 11:07:25 UTC 2016 - jengelh@inai.de
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index b986eb07..91068798 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -394,11 +394,11 @@ License:        LGPL-2.1+
 Group:          System/Base
 
 %description -n systemctl
-This subpackage contains the "systemctl" and "tmpfiles" programs of
-systemd, factored out to support RPM scriptlets making use of these
-two. It is meant for container/chroot directories for which the
+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 links for a later time.
+maintaining the /etc/systemd symlinks links for a later time.
 
 %package -n udev%{?mini}
 Summary:        A rule-based device node and kernel event manager
@@ -1185,7 +1185,6 @@ exit 0
 %{_bindir}/systemd-escape
 %{_bindir}/systemd-firstboot
 %{_bindir}/systemd-path
-%{_bindir}/systemd-sysusers
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-run
 %{_bindir}/systemd-journalctl
@@ -1273,7 +1272,6 @@ 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
 
@@ -1595,7 +1593,9 @@ exit 0
 %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
diff --git a/systemd.changes b/systemd.changes
index 4a519473..4968fe94 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 29 11:49:39 UTC 2016 - jengelh@inai.de
+
+- Add sysusers to the new split "systemctl" subpackage
+
 -------------------------------------------------------------------
 Tue Jul 26 11:07:25 UTC 2016 - jengelh@inai.de
 
diff --git a/systemd.spec b/systemd.spec
index 7954cf32..03eab46f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -389,11 +389,11 @@ License:        LGPL-2.1+
 Group:          System/Base
 
 %description -n systemctl
-This subpackage contains the "systemctl" and "tmpfiles" programs of
-systemd, factored out to support RPM scriptlets making use of these
-two. It is meant for container/chroot directories for which the
+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 links for a later time.
+maintaining the /etc/systemd symlinks for a later time.
 
 %package -n udev%{?mini}
 Summary:        A rule-based device node and kernel event manager
@@ -1180,7 +1180,6 @@ exit 0
 %{_bindir}/systemd-escape
 %{_bindir}/systemd-firstboot
 %{_bindir}/systemd-path
-%{_bindir}/systemd-sysusers
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-run
 %{_bindir}/systemd-journalctl
@@ -1268,7 +1267,6 @@ 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
 
@@ -1590,7 +1588,9 @@ exit 0
 %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