From 0078f9a1029bbfd9dc12e79032072a7ff46182a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 17 Mar 2022 21:37:30 +0100
Subject: [PATCH] Really move libcryptsetup plugins to -udev

---
 split-files.py | 14 ++++++++++----
 systemd.spec   |  5 ++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/split-files.py b/split-files.py
index d202c59..a660db8 100644
--- a/split-files.py
+++ b/split-files.py
@@ -28,7 +28,7 @@ o_resolve = open('.file-list-resolve', 'w')
 o_tests = open('.file-list-tests', 'w')
 o_standalone_tmpfiles = open('.file-list-standalone-tmpfiles', 'w')
 o_standalone_sysusers = open('.file-list-standalone-sysusers', 'w')
-o_rest = open('.file-list-rest', 'w')
+o_main = open('.file-list-main', 'w')
 for file in files(buildroot):
     n = file.path[1:]
     if re.match(r'''/usr/(share|include)$|
@@ -58,7 +58,11 @@ for file in files(buildroot):
         o = o_rpm_macros
     elif '/usr/lib/systemd/tests' in n:
         o = o_tests
-    elif re.search(r'/lib.*\.pc|/man3/|/usr/include|(?<!/libsystemd-shared-...).so$', n):
+    elif re.match(r'/libsystemd-shared-*.so$', n):
+        o = o_main
+    elif re.match(r'/libcryptsetup-token-systemd-.*\.so$', n):
+        o = o_udev
+    elif re.search(r'/lib.*\.pc|/man3/|/usr/include|\.so$', n):
         o = o_devel
     elif re.search(r'''journal-(remote|gateway|upload)|
                        systemd-remote\.conf|
@@ -66,6 +70,7 @@ for file in files(buildroot):
                        /var/log/journal/remote
     ''', n, re.X):
         o = o_remote
+
     elif re.search(r'''mymachines|
                        machinectl|
                        systemd-nspawn|
@@ -77,12 +82,14 @@ for file in files(buildroot):
                        org.freedesktop.(import|machine)1
     ''', n, re.X):
         o = o_container
+
     elif re.search(r'''/usr/lib/systemd/network/80-|
                        networkd|
                        networkctl|
                        org.freedesktop.network1
     ''', n, re.X):
         o = o_networkd
+
     elif '.so.' in n:
         o = o_libs
 
@@ -103,7 +110,6 @@ for file in files(buildroot):
                        crypttab|
                        cryptenroll|
                        cryptsetup|
-                       libcryptsetup-token-systemd|
                        kmod|
                        quota|
                        pstore|
@@ -153,7 +159,7 @@ for file in files(buildroot):
             assert False, 'Found .standalone not belonging to known packages'
 
     else:
-        o = o_rest
+        o = o_main
 
     if n in known_files:
         prefix = ' '.join(known_files[n].split()[:-1])
diff --git a/systemd.spec b/systemd.spec
index 7d149be..d6132d6 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -951,7 +951,7 @@ fi
 
 %global _docdir_fmt %{name}
 
-%files -f %{name}.lang -f .file-list-rest
+%files -f %{name}.lang -f .file-list-main
 %doc %{_pkgdocdir}
 %exclude %{_pkgdocdir}/LICENSE*
 # Only the licenses texts for the licenses in License line are included.
@@ -1004,6 +1004,9 @@ fi
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Thu Mar 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.3-7
+- Move libcryptsetup plugins to -udev (#2031873)
+
 * Mon Mar 14 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 250.3-7
 - Disable default DNS over TLS (#1889901)