From eb3d0eeb45cb5187c601659b146ccca33b3ae8b774d5f9fd19ebf29361194f3e Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Thu, 17 Jun 2021 15:36:00 +0000
Subject: [PATCH] Accepting request 900613 from home:mwilck:suse-module-tools

- Update to version 16.0.4:
  * re-add legacy subpackage with "weak-modules", and add a
    "Supplements" dependency on dkms, which needs it

OBS-URL: https://build.opensuse.org/request/show/900613
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=115
---
 _servicedata                     |  2 +-
 suse-module-tools-16.0.3.obscpio |  3 ---
 suse-module-tools-16.0.4.obscpio |  3 +++
 suse-module-tools.changes        |  7 +++++++
 suse-module-tools.obsinfo        |  6 +++---
 suse-module-tools.spec           | 21 +++++++++++++++++++--
 6 files changed, 33 insertions(+), 9 deletions(-)
 delete mode 100644 suse-module-tools-16.0.3.obscpio
 create mode 100644 suse-module-tools-16.0.4.obscpio

diff --git a/_servicedata b/_servicedata
index e7792ed..2199e98 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">23c00579a78af3f1c28014b1f70c8114fc98033f</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">fe422e7058c691493567eeffc162f278b2120549</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-16.0.3.obscpio b/suse-module-tools-16.0.3.obscpio
deleted file mode 100644
index 9088cfe..0000000
--- a/suse-module-tools-16.0.3.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faf1ceabd7a29709e6ab34e145d02434e3a956e35f502c4d7c911374e500de5f
-size 83979
diff --git a/suse-module-tools-16.0.4.obscpio b/suse-module-tools-16.0.4.obscpio
new file mode 100644
index 0000000..dd18c7f
--- /dev/null
+++ b/suse-module-tools-16.0.4.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4186329fde129bd7de4ad88612e7eb4c62a8f8b18486f6058b46448b59222dc
+size 93707
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index c18f59b..4fbd30c 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 17 14:43:13 UTC 2021 - mwilck@suse.com
+
+- Update to version 16.0.4:
+  * re-add legacy subpackage with "weak-modules", and add a
+    "Supplements" dependency on dkms, which needs it
+
 -------------------------------------------------------------------
 Thu Jun 17 13:10:42 UTC 2021 - mwilck@suse.com
 
diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo
index e9784a1..d0ebe48 100644
--- a/suse-module-tools.obsinfo
+++ b/suse-module-tools.obsinfo
@@ -1,5 +1,5 @@
 name: suse-module-tools
-version: 16.0.3
-mtime: 1623935346
-commit: 23c00579a78af3f1c28014b1f70c8114fc98033f
+version: 16.0.4
+mtime: 1623940916
+commit: fe422e7058c691493567eeffc162f278b2120549
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index e1d34e6..906b281 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -28,7 +28,7 @@
 %endif
 
 Name:           suse-module-tools
-Version:        16.0.3
+Version:        16.0.4
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -60,6 +60,18 @@ modprobe. These utilities are provided by kmod-compat or
 module-init-tools, whichever implementation you choose to install.
 
 
+%package legacy
+Summary:        Legacy "weak-modules" script for Code10
+Group:          System/Base
+Requires:       %{name}
+Requires:       binutils
+Supplements:    dkms
+
+%description legacy
+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.
+
 %prep
 %setup -q
 
@@ -93,7 +105,7 @@ install -pm 644 "depmod-00-system.conf" \
 
 # "/usr/lib/module-init-tools" name hardcoded in KMPs, mkinitrd, etc.
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
-install -pm 755 weak-modules2 "%{buildroot}/usr/lib/module-init-tools/"
+install -pm 755 weak-modules{,2} "%{buildroot}/usr/lib/module-init-tools/"
 install -pm 755 driver-check.sh "%{buildroot}/usr/lib/module-init-tools/"
 
 %if 0%{?suse_version} < 1550
@@ -256,6 +268,7 @@ done
 %endif
 %{_bindir}/kmp-install
 /usr/lib/module-init-tools
+%exclude /usr/lib/module-init-tools/weak-modules
 %{_unitdir}/systemd-sysctl.service.d
 %dir %{modules_load_dir}
 %{modules_load_dir}/sg.conf
@@ -263,4 +276,8 @@ done
 /usr/lib/systemd/system-generators
 %endif
 
+%files legacy
+%defattr(-,root,root)
+/usr/lib/module-init-tools/weak-modules
+
 %changelog