From 283a994776e089f12953fb061ddcb64d66c1db0f Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 30 Sep 2020 12:21:11 -0400
Subject: [PATCH] split-files: break out more files into networkd subpackage

There were some things left in the main package that should have
been in the sub package (including networkd.conf). This is an attempt
to make the list of files in the networkd package more correct.

It explicitly tries to leave sytemd-network-generator and the network
targets in the main package.
---
 split-files.py | 15 ++++++++++-----
 systemd.spec   |  6 +++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/split-files.py b/split-files.py
index f07b9da..e1b2124 100644
--- a/split-files.py
+++ b/split-files.py
@@ -54,12 +54,10 @@ for file in files(buildroot):
         o = o_pam
     elif '/rpm/' in n:
         o = o_rpm_macros
-    elif re.search(r'networkd(?!.*\.conf)', n, re.X):
-        o = o_networkd
-    elif re.search(r'/lib.*\.pc|/man3/|/usr/include|(?<!/libsystemd-shared-...).so$', n):
-        o = o_devel
     elif '/usr/lib/systemd/tests' in n:
         o = o_tests
+    elif re.search(r'/lib.*\.pc|/man3/|/usr/include|(?<!/libsystemd-shared-...).so$', n):
+        o = o_devel
     elif re.search(r'''journal-(remote|gateway|upload)|
                        systemd-remote\.conf|
                        /usr/share/systemd/gatewayd|
@@ -74,10 +72,17 @@ for file in files(buildroot):
                        /machine.slice|
                        /machines.target|
                        var-lib-machines.mount|
-                       network/80-container-v[ez]|
+                       network/80-container|
+                       network/80-vm|
                        org.freedesktop.(import|machine)1
     ''', n, re.X):
         o = o_container
+    elif re.search(r'''/usr/lib/systemd/network/..-wifi|
+                       networkd|
+                       networkctl|
+                       org.freedesktop.network1
+    ''', n, re.X):
+        o = o_networkd
     elif '.so.' in n:
         o = o_libs
     elif re.search(r'''udev(?!\.pc)|
diff --git a/systemd.spec b/systemd.spec
index 96f6a82..538f19b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,7 +21,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        246.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -868,6 +868,10 @@ fi
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Wed Sep 30 2020 Dusty Mabe <dusty@dustymabe.com> - 246.6-3
+- Try to make files in subpackages (especially the networkd subpackage)
+  more appropriate.
+
 * Thu Sep 24 2020 Filipe Brandenburger <filbranden@gmail.com> - 246.6-2
 - Build a package with standalone binaries for non-systemd systems.
   For now, only systemd-sysusers is included.