From 7c2be928b81ece1e7b7f2077e7394eca106e55d0647c923714c3581d3fa4c588 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Tue, 9 Nov 2021 10:35:47 +0000
Subject: [PATCH] Accepting request 930393 from home:mwilck:suse-module-tools

- Update to version 16.0.14:
  * add udev rules from system-tuning-common-SUSE / udev-extra-rules
    These packages are now both obsoleted  by s-m-t.
  * 60-io-scheduler.rules: don't use BFQ for real multiqueue devices

OBS-URL: https://build.opensuse.org/request/show/930393
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=130
---
 _servicedata                      |  2 +-
 suse-module-tools-16.0.13.obscpio |  3 ---
 suse-module-tools-16.0.14.obscpio |  3 +++
 suse-module-tools.changes         |  8 ++++++++
 suse-module-tools.obsinfo         |  6 +++---
 suse-module-tools.spec            | 13 ++++++++++++-
 6 files changed, 27 insertions(+), 8 deletions(-)
 delete mode 100644 suse-module-tools-16.0.13.obscpio
 create mode 100644 suse-module-tools-16.0.14.obscpio

diff --git a/_servicedata b/_servicedata
index c8bff5f..23e652e 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">78e2a3360cd9727d372174e1ced7f4ad3af01eb8</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">d8afc0d96f176f7d1985737228ea9ba79d8147d4</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-16.0.13.obscpio b/suse-module-tools-16.0.13.obscpio
deleted file mode 100644
index 4a68f4f..0000000
--- a/suse-module-tools-16.0.13.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2eb035bb0a3977e990458155b8921eb14e80a89435b45e959b0ab3f45b25daab
-size 121355
diff --git a/suse-module-tools-16.0.14.obscpio b/suse-module-tools-16.0.14.obscpio
new file mode 100644
index 0000000..4332e28
--- /dev/null
+++ b/suse-module-tools-16.0.14.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9692f94e6a75ce9f03c166241cdb35e8cc9b71026d1eee43def3704faae1fc3d
+size 128011
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 8bbc938..1da1146 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov 08 22:05:58 UTC 2021 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 16.0.14:
+  * add udev rules from system-tuning-common-SUSE / udev-extra-rules
+    These packages are now both obsoleted  by s-m-t.
+  * 60-io-scheduler.rules: don't use BFQ for real multiqueue devices
+
 -------------------------------------------------------------------
 Fri Oct 22 20:37:38 UTC 2021 - Martin Wilck <mwilck@suse.com>
 
diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo
index 47b0278..41af3cf 100644
--- a/suse-module-tools.obsinfo
+++ b/suse-module-tools.obsinfo
@@ -1,4 +1,4 @@
 name: suse-module-tools
-version: 16.0.13
-mtime: 1634934608
-commit: 78e2a3360cd9727d372174e1ced7f4ad3af01eb8
+version: 16.0.14
+mtime: 1636409143
+commit: d8afc0d96f176f7d1985737228ea9ba79d8147d4
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 8765daf..f618f1e 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.13
+Version:        16.0.14
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -65,6 +65,10 @@ Requires(post): /usr/bin/grep
 Requires(post): /usr/bin/sed
 Requires(post): coreutils
 Provides:       suse-kernel-rpm-scriptlets = 0
+Provides:       udev-extra-rules = 0.3.0
+Obsoletes:      udev-extra-rules < 0.3.0
+Provides:       system-tuning-common-SUSE = 0.3.0
+Obsoletes:      system-tuning-common-SUSE < 0.3.0
 # Use weak dependencies for dracut and kmod in order to
 # keep Ring0 lean. In normal deployments, these packages
 # will be available anyway.
@@ -172,6 +176,10 @@ install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
 install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators
 %endif
 
+# udev rules (formerly system-tuning-common-SUSE, udev-extra-rules)
+install -d -m 755 %{buildroot}/%{_prefix}/lib/udev/rules.d/
+install -m 644 udevrules/*.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/
+
 mkdir -p %{buildroot}%{_defaultlicensedir}
 
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
@@ -205,6 +213,7 @@ fi
 exit 0
 
 %post
+%udev_rules_update
 %service_add_post %{systemd_units}
 exit 0
 
@@ -213,6 +222,7 @@ exit 0
 exit 0
 
 %postun
+%udev_rules_update
 %service_del_postun_without_restart %{systemd_units}
 exit 0
 
@@ -248,6 +258,7 @@ exit 0
 %{_unitdir}/*.service
 %{_unitdir}/systemd-sysctl.service.d
 %{_modulesloaddir}
+/%{_prefix}/lib/udev/rules.d/
 %ifarch ppc64 ppc64le
 /usr/lib/systemd/system-generators
 %endif