diff --git a/_service b/_service index 8dcf5e5..a946cd2 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git enable suse-module-tools - 15.0.20 + 15.1.0 master *.spec *.rpmlintrc diff --git a/_servicedata b/_servicedata index 1ba84d5..14373f9 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 1396df57d144f145d0e7e71d179e0a1aea6a34c6 \ No newline at end of file + d263ea6fb851327a740a2612ac8fcae7751e9fee \ 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 deleted file mode 100644 index 25c3a11..0000000 --- a/suse-module-tools-15.0.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:439237025e98507a93fae463866dfdfb7f84c60da2b9f63cd804ad17fda1ee49 -size 25964 diff --git a/suse-module-tools-15.1.0.tar.xz b/suse-module-tools-15.1.0.tar.xz new file mode 100644 index 0000000..b63405c --- /dev/null +++ b/suse-module-tools-15.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a39b5c4354391a16e4bd919a3f635e3895d0d4bee5289be0f0b58a135c37df70 +size 25972 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index cb27d33..6e11b7b 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 31 21:50:45 UTC 2019 - mwilck@suse.com + +- Update to version 15.1.0 (git d263ea6): + * 50-blacklist.conf is not added in Leap before 15.1. + fix conditionals and bump version accordingly. + ------------------------------------------------------------------- Wed Jan 30 23:04:26 UTC 2019 - mwilck@suse.com diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 766332a..6f97ea8 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -17,7 +17,7 @@ Name: suse-module-tools -Version: 15.0.20 +Version: 15.1.0 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -78,7 +78,7 @@ install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d" install -pm644 "10-unsupported-modules.conf" \ "%{buildroot}%{_sysconfdir}/modprobe.d/" install -pm644 00-system.conf "%{buildroot}%{_sysconfdir}/modprobe.d/" -%if 0%{?suse_version} >= 1500 +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 install -pm644 modprobe.conf/modprobe.conf.blacklist "%{buildroot}%{_sysconfdir}/modprobe.d/50-blacklist.conf" %endif install -pm644 modprobe.conf/modprobe.conf.local "%{buildroot}%{_sysconfdir}/modprobe.d/99-local.conf" @@ -191,7 +191,7 @@ fi %dir %{_sysconfdir}/modprobe.d %config %{_sysconfdir}/modprobe.d/00-system.conf %config(noreplace) %{_sysconfdir}/modprobe.d/10-unsupported-modules.conf -%if 0%{?suse_version} >= 1500 +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 %config(noreplace) %{_sysconfdir}/modprobe.d/50-blacklist.conf %endif %config(noreplace) %{_sysconfdir}/modprobe.d/99-local.conf