From b3edbe9ef55a18345372b4b4d7d81f07f0f06c5449b8754f2bc494e92d5caf22 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Fri, 23 Sep 2022 10:44:31 +0000
Subject: [PATCH] Accepting request 1005598 from home:mwilck:suse-module-tools

- Update to version 16.0.24:
  * Split kernel scriptlets into separate sub-package
    "suse-module-tools-scriptlets" on Tumbleweed
    (gh#openSUSE/suse-module-tools#64)

OBS-URL: https://build.opensuse.org/request/show/1005598
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=145
---
 _servicedata                      |  2 +-
 suse-module-tools-16.0.23.obscpio |  3 ---
 suse-module-tools-16.0.24.obscpio |  3 +++
 suse-module-tools.changes         |  8 ++++++++
 suse-module-tools.obsinfo         |  6 +++---
 suse-module-tools.spec            | 29 ++++++++++++++++++++++++++---
 6 files changed, 41 insertions(+), 10 deletions(-)
 delete mode 100644 suse-module-tools-16.0.23.obscpio
 create mode 100644 suse-module-tools-16.0.24.obscpio

diff --git a/_servicedata b/_servicedata
index 24cb485..e11f5d4 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
-              <param name="changesrevision">7b60f9764ada8f304a3c9695b2d35243827c7892</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">a6db28189a23cb3a5cf46b004f7618cd81b04078</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-16.0.23.obscpio b/suse-module-tools-16.0.23.obscpio
deleted file mode 100644
index 78a6c65..0000000
--- a/suse-module-tools-16.0.23.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:993aca583050c4569692e2ca1afe1897d241f728222a70979b157f3482e02f2f
-size 134667
diff --git a/suse-module-tools-16.0.24.obscpio b/suse-module-tools-16.0.24.obscpio
new file mode 100644
index 0000000..2653371
--- /dev/null
+++ b/suse-module-tools-16.0.24.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a772a4ed8eff1ab3e73af3a89765e816494b4e4cbc0a5356e18af2798327b43
+size 135179
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index aa0e087..4b0deb7 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 23 10:40:07 UTC 2022 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 16.0.24:
+  * Split kernel scriptlets into separate sub-package 
+    "suse-module-tools-scriptlets" on Tumbleweed
+    (gh#openSUSE/suse-module-tools#64)
+
 -------------------------------------------------------------------
 Mon Sep 12 15:28:13 UTC 2022 - Martin Wilck <mwilck@suse.com>
 
diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo
index 214db6a..16e1083 100644
--- a/suse-module-tools.obsinfo
+++ b/suse-module-tools.obsinfo
@@ -1,4 +1,4 @@
 name: suse-module-tools
-version: 16.0.23
-mtime: 1662996437
-commit: 7b60f9764ada8f304a3c9695b2d35243827c7892
+version: 16.0.24
+mtime: 1663929461
+commit: a6db28189a23cb3a5cf46b004f7618cd81b04078
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 7475f29..dd716ad 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -45,7 +45,7 @@
 %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
 
 Name:           suse-module-tools
-Version:        16.0.23
+Version:        16.0.24
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -64,7 +64,9 @@ Requires:       rpm
 Requires(post): /usr/bin/grep
 Requires(post): /usr/bin/sed
 Requires(post): coreutils
+%if 0%{?suse_version} < 1550
 Provides:       suse-kernel-rpm-scriptlets = 0
+%endif
 Provides:       udev-extra-rules = 0.3.0
 Obsoletes:      udev-extra-rules < 0.3.0
 Provides:       system-tuning-common-SUSE = 0.3.0
@@ -99,6 +101,17 @@ This package contains the legacy "weak-modules" script for kernel
 module package (KMP) support. It was replaced by "weak-modules2" in
 SLE 11 and later. It is still used by the DKMS module packaging framework.
 
+%if 0%{?suse_version} >= 1550
+%package scriptlets
+Summary:        Kernel rpm scriptlets
+Provides:       suse-kernel-rpm-scriptlets = 0
+Requires:       suse-module-tools = %{version}
+Provides:       suse-module-tools:/usr/lib/module-init-tools/kernel-scriptlets
+
+%description scriptlets
+Scripts called by the SUSE kernel packages on installation
+%endif
+
 %prep
 %setup -q
 
@@ -263,8 +276,12 @@ exit 0
 %{_rpmmacrodir}/macros.initrd
 %endif
 %{_bindir}/kmp-install
-/usr/lib/module-init-tools
-%exclude /usr/lib/module-init-tools/weak-modules
+%dir /usr/lib/module-init-tools
+/usr/lib/module-init-tools/driver-check.sh
+/usr/lib/module-init-tools/lsinitrd-quick
+/usr/lib/module-init-tools/regenerate-initrd-posttrans
+/usr/lib/module-init-tools/unblacklist
+/usr/lib/module-init-tools/weak-modules2
 %{_unitdir}/*.service
 %{_unitdir}/systemd-sysctl.service.d
 %{_modulesloaddir}
@@ -272,6 +289,12 @@ exit 0
 %ifarch ppc64 ppc64le
 /usr/lib/systemd/system-generators
 %endif
+#
+%if 0%{?suse_version} >= 1550
+%files scriptlets
+%endif
+/usr/lib/module-init-tools/kernel-scriptlets
+
 
 %files legacy
 %defattr(-,root,root)