From 9f5df8169346bfb18d212883e3ad2ac03ba87d3b08645c04488b55059860a9c0 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Wed, 30 Jan 2019 23:08:19 +0000
Subject: [PATCH] - Update to version 15.0.20 (git 1396df5): revert fs
 blacklist change for now. too controversial to push at this time

OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=55
---
 _servicedata                     | 2 +-
 suse-module-tools-15.0.20.tar.xz | 4 ++--
 suse-module-tools.changes        | 7 +++----
 suse-module-tools.spec           | 6 ------
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/_servicedata b/_servicedata
index 4eeaf0a..1ba84d5 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">2f55a7ecc640a52bc621c89df8a01d54d1a8e6e3</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">1396df57d144f145d0e7e71d179e0a1aea6a34c6</param></service></servicedata>
\ No newline at end of file
diff --git a/suse-module-tools-15.0.20.tar.xz b/suse-module-tools-15.0.20.tar.xz
index 6df9e7f..25c3a11 100644
--- a/suse-module-tools-15.0.20.tar.xz
+++ b/suse-module-tools-15.0.20.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cd8f1582e0940ce1e236b0573bd2424f9cd7150de570ab76a57264ff1c885d1
-size 26272
+oid sha256:439237025e98507a93fae463866dfdfb7f84c60da2b9f63cd804ad17fda1ee49
+size 25964
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 22a65f5..cb27d33 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,11 +1,10 @@
-------------------------------------------------------------------
-Wed Jan 30 15:50:21 UTC 2019 - Martin Wilck <mwilck@suse.com>
+-------------------------------------------------------------------
+Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com
 
-- Update to version 15.0.20 (git 2f55a7ec):
+- Update to version 15.0.20 (git 1396df5):
 - Fix driver-check.sh (boo#1123697, boo#1123704)
 - add /etc/modprobe.d/50-blacklist.conf from sysconfig package
   (boo#1107611)
-- add file system blacklist file (fate#326832)
 - Remove hard dependency on mkinitrd (boo#1123721)
 - Make sure code works also without kmod-compat
 - Replace file dependency on /sbin/depmod by weak package dependency
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index fb42857..766332a 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -80,9 +80,6 @@ install -pm644 "10-unsupported-modules.conf" \
 install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/"
 %if 0%{?suse_version} >= 1500
 install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf"
-%if !0%{?is_opensuse}
-install -pm644 modprobe.conf/modprobe.conf.fs-blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/60-filesystem-blacklist.conf"
-%endif
 %endif
 install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf"
 install -d -m 755 "%{buildroot}%{_sysconfdir}/depmod.d"
@@ -196,9 +193,6 @@ fi
 %config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf
 %if 0%{?suse_version} >= 1500
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf
-%if !0%{?is_opensuse}
-%config(noreplace) %{_sysconfdir}/modprobe.d/60-filesystem-blacklist.conf
-%endif
 %endif
 %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf
 %dir %{_sysconfdir}/depmod.d