Accepting request 1033596 from home:mwilck:suse-module-tools

* Revert "Split kernel scriptlets into separate sub-package"
   (that change broke some package builds on OBS)

OBS-URL: https://build.opensuse.org/request/show/1033596
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=147

_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">da30af6d95c18bc50b089707f5ae7b47104388a3</param></service></servicedata>
+              <param name="changesrevision">ba92a0df58a5063e1243c2386c29623878641b89</param></service></servicedata>

suse-module-tools-16.0.25.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52e8e174acc36169537d21bcbb028fdf41e9222be90ce5088004a8b56606c7cf
-size 135691

suse-module-tools-16.0.26.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c083fd24365dbf3c704829a641559c368eccc051970165f227c2b293de06010
+size 134667

suse-module-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  4 17:49:31 UTC 2022 - Martin Wilck <mwilck@suse.com>
+
+  * Revert "Split kernel scriptlets into separate sub-package"
+   (that change broke some package builds on OBS)
+
 -------------------------------------------------------------------
 Fri Nov  4 17:24:09 UTC 2022 - Martin Wilck <mwilck@suse.com>
 

suse-module-tools.obsinfo

@@ -1,4 +1,4 @@
 name: suse-module-tools
-version: 16.0.25
-mtime: 1667564350
-commit: da30af6d95c18bc50b089707f5ae7b47104388a3
+version: 16.0.26
+mtime: 1667584099
+commit: ba92a0df58a5063e1243c2386c29623878641b89

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.25
+Version:        16.0.26
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -64,9 +64,7 @@ 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
@@ -101,17 +99,6 @@ 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
 
@@ -276,12 +263,8 @@ exit 0
 %{_rpmmacrodir}/macros.initrd
 %endif
 %{_bindir}/kmp-install
-%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
+/usr/lib/module-init-tools
+%exclude /usr/lib/module-init-tools/weak-modules
 %{_unitdir}/*.service
 %{_unitdir}/systemd-sysctl.service.d
 %{_modulesloaddir}
@@ -289,12 +272,6 @@ 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)