From aac00d2a85340f85c5485880869e8937705d30e32a7b2a7c7a5046388ccddbfd Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 27 May 2020 21:10:59 +0000
Subject: [PATCH] Accepting request 809697 from
 home:mwilck:branches:Base:System

- Update to version 15.3.3:
  * spec: remove SLE/openSUSE difference in allow_unsupported_modules
  (jsc#SLE-12255)
  * spec: use same fs_blacklist on SLE and openSUSE
  (jsc#SLE-12255, jsc#SLE-4085)
  * spec: use br_netfilter softdep only for SLE12
  (jsc#SLE-12255, bsc#1166531, boo#1158817, bsc#937216)

OBS-URL: https://build.opensuse.org/request/show/809697
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=86
---
 _service                         | 15 ++++++++++-----
 _servicedata                     |  2 +-
 suse-module-tools-15.3.2.tar.xz  |  3 ---
 suse-module-tools-15.3.3.obscpio |  3 +++
 suse-module-tools.changes        | 11 +++++++++++
 suse-module-tools.obsinfo        |  5 +++++
 suse-module-tools.spec           | 13 ++-----------
 7 files changed, 32 insertions(+), 20 deletions(-)
 delete mode 100644 suse-module-tools-15.3.2.tar.xz
 create mode 100644 suse-module-tools-15.3.3.obscpio
 create mode 100644 suse-module-tools.obsinfo

diff --git a/_service b/_service
index c93545d..e5cb224 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,5 @@
 <services>
-  <service mode="disabled" name="tar_scm">
+  <service mode="disabled" name="obs_scm">
     <param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
@@ -8,14 +8,19 @@
     <param name="versionrewrite-pattern">\+0$</param>
     <param name="versionrewrite-replacement"></param>
     <param name="revision">master</param>
-    <param name="exclude">*.spec</param>
     <param name="exclude">*.rpmlintrc</param>
   </service>
-  <service mode="disabled" name="set_version">
-    <param name="basename">suse-module-tools</param>
+  <service mode="disabled" name="extract_file">
+    <param name="archive">*.obscpio</param>
+    <param name="files">*/suse-module-tools.spec</param>
+    <param name="outfilename">suse-module-tools.spec</param>
   </service>
-  <service mode="disabled" name="recompress">
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
+  <!-- <service mode="disabled" name="set_version">
+    <param name="basename">suse-module-tools</param>
+  </service> -->
 </services>
diff --git a/_servicedata b/_servicedata
index c9e841f..44a1fe2 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">ee68844d60e97a584f4f67fc0c274b5f83f38bb6</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">5def500a75de25a50a156ebf1af7233c386e0aa2</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.3.2.tar.xz b/suse-module-tools-15.3.2.tar.xz
deleted file mode 100644
index 8f2e97e..0000000
--- a/suse-module-tools-15.3.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f74562e951ad5912d9d580f5006233192f41fb5fbfe5e7fb2d7211643b24ab14
-size 25328
diff --git a/suse-module-tools-15.3.3.obscpio b/suse-module-tools-15.3.3.obscpio
new file mode 100644
index 0000000..b99e3be
--- /dev/null
+++ b/suse-module-tools-15.3.3.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:566b556d36cf0fb17479966210d67c4272b65a49293909d365d0767da5e72f75
+size 97803
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 02c768d..8f91109 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed May 27 20:49:04 UTC 2020 - mwilck@suse.com
+
+- Update to version 15.3.3:
+  * spec: remove SLE/openSUSE difference in allow_unsupported_modules
+  (jsc#SLE-12255)
+  * spec: use same fs_blacklist on SLE and openSUSE
+  (jsc#SLE-12255, jsc#SLE-4085)
+  * spec: use br_netfilter softdep only for SLE12
+  (jsc#SLE-12255, bsc#1166531, boo#1158817, bsc#937216)
+
 -------------------------------------------------------------------
 Fri Apr 17 15:32:54 UTC 2020 - mwilck@suse.com
 
diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo
new file mode 100644
index 0000000..f941bc8
--- /dev/null
+++ b/suse-module-tools.obsinfo
@@ -0,0 +1,5 @@
+name: suse-module-tools
+version: 15.3.3
+mtime: 1590612157
+commit: 5def500a75de25a50a156ebf1af7233c386e0aa2
+
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index a982bf3..ee5f91f 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -21,19 +21,14 @@
 %define modules_load_dir /usr/lib/modules-load.d
 
 # List of legacy file systems to be blacklisted by default
-%if 0%{?is_opensuse}
 %global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs f2fs hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs
-%else
-# SLE only ships a few of them
-%global fs_blacklist cramfs ufs
-%endif
 
-%if 0%{?sle_version} >= 120200 && 0%{?is_opensuse} == 0
+%if 0%{?sle_version} >= 120200 && 0%{?sle_version} < 150000
 %global softdep_br_netfilter 1
 %endif
 
 Name:           suse-module-tools
-Version:        15.3.2
+Version:        15.3.3
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -81,10 +76,6 @@ SLE 11 and later.
 %setup -q
 
 %build
-%if 0%{?is_opensuse} == 0
-sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \
-	10-unsupported-modules.conf
-%endif
 
 %install
 # now assemble the parts for modprobe.conf