From c9030f045ba66cc76753f71d07bb92d87d91a63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 2 Nov 2018 11:39:52 +0100
Subject: [PATCH] Split out the rpm macros into systemd-rpm-macros subpackage

---
 split-files.py |  3 +++
 systemd.spec   | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/split-files.py b/split-files.py
index 262ee04..61ed548 100644
--- a/split-files.py
+++ b/split-files.py
@@ -18,6 +18,7 @@ def files(root):
 o_libs = open('.file-list-libs', 'w')
 o_udev = open('.file-list-udev', 'w')
 o_pam = open('.file-list-pam', 'w')
+o_rpm_macros = open('.file-list-rpm-macros', 'w')
 o_devel = open('.file-list-devel', 'w')
 o_container = open('.file-list-container', 'w')
 o_remote = open('.file-list-remote', 'w')
@@ -47,6 +48,8 @@ for file in files(buildroot):
         continue
     if '/security/pam_' in n:
         o = o_pam
+    elif 'rpm/macros' in n:
+        o = o_rpm_macros
     elif re.search(r'/lib.*\.pc|/man3/|/usr/include|(?<!/libsystemd-shared-...).so$', n):
         o = o_devel
     elif '/usr/lib/systemd/tests' in n:
diff --git a/systemd.spec b/systemd.spec
index 26d9154..db28e4a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -15,7 +15,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        239
-Release:        6%{?commit:.git%{shortcommit}}%{?dist}
+Release:        7%{?commit:.git%{shortcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -110,6 +110,7 @@ Requires(pre):  /usr/bin/getent
 Requires(pre):  /usr/sbin/groupadd
 Requires:       dbus >= 1.9.18
 Requires:       %{name}-pam = %{version}-%{release}
+Requires:       %{name}-rpm-macros = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Recommends:     diffutils
 Requires:       util-linux
@@ -170,6 +171,13 @@ Requires:       %{name} = %{version}-%{release}
 %description pam
 Systemd PAM module registers the session with systemd-logind.
 
+%package rpm-macros
+Summary:        Macros that define paths and scriptlets related to systemd
+
+%description rpm-macros
+Just the definitions of rpm macros. Use %%{?systemd_requires} in the
+binary packages that use any scriptlets from this package.
+
 %package devel
 Summary:        Development headers for systemd
 License:        LGPLv2+ and MIT
@@ -678,6 +686,8 @@ fi
 
 %files pam -f .file-list-pam
 
+%files rpm-macros -f .file-list-rpm-macros
+
 %files devel -f .file-list-devel
 
 %files udev -f .file-list-udev
@@ -689,6 +699,9 @@ fi
 %files tests -f .file-list-tests
 
 %changelog
+* Fri Nov  2 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 239-7.git9f3aed1
+- Split out the rpm macros into systemd-rpm-macros subpackage (#1645298)
+
 * Sun Oct 28 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 239-6.git9f3aed1
 - Fix a local vulnerability from a race condition in chown-recursive (CVE-2018-15687, #1639076)
 - Fix a local vulnerability from invalid handling of long lines in state deserialization (CVE-2018-15686, #1639071)