diff --git a/_service b/_service index 7edde49..46a1f80 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ are have been added to factory before upstream will be counted. Determine patch offset manually! It should be the number of patches which are _really_ not upstream (yet). --> - @PARENT_TAG@+17+suse.%h + @PARENT_TAG@+8+suse.%h factory 0.[0-9].[0-9] enable diff --git a/_servicedata b/_servicedata index caacbcd..b53a6c2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - a28893f67c7ca0009b9ef8b85732348b3c3092f1 - https://github.com/mwilck/multipath-tools.git - 08a969b7fce0db769b63bdbfead2a452dc417d58 \ No newline at end of file + 8c114985f9fd7eb142ddec9737870f99ff28d5ba \ No newline at end of file diff --git a/multipath-tools-0.8.0+17+suse.a28893f.tar.xz b/multipath-tools-0.8.0+17+suse.a28893f.tar.xz deleted file mode 100644 index 18e3c4d..0000000 --- a/multipath-tools-0.8.0+17+suse.a28893f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1df004ef6789d948211245d2cc34826ad06281545b7099f558b3224987f6e22c -size 353608 diff --git a/multipath-tools-0.8.1+8+suse.8c11498.tar.xz b/multipath-tools-0.8.1+8+suse.8c11498.tar.xz new file mode 100644 index 0000000..4a0b9b1 --- /dev/null +++ b/multipath-tools-0.8.1+8+suse.8c11498.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6dd450574241885530d18a14f3e250389f711500c7f6541f7c83c37b2eb5624 +size 354572 diff --git a/multipath-tools.changes b/multipath-tools.changes index d2c38e3..8a8b662 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Apr 30 14:48:40 UTC 2019 - mwilck@suse.com + +- Disable kmod() style dependencies again (bsc#1119414) + * For TW, dependencies will be autogenerated + (gh#openSUSE/rpm-config-SUSE#3) + * For SLE, feature is currently rejected (jsc#SLE-3853) +- Update to version 0.8.1+8+suse.8c11498: + * Avoid deadlock situation during udev settle + (bsc#1131789, bsc#1125145) + - multipath -u: test socket connection in non-blocking mode + * Fix priority handling for offline paths + (bsc#1118495) +- Update to upstream 0.8.1 + * Avoid device IO in "multipath -u" (bsc#1125145) + * multipathd: protect all access to running_state + (bsc##1110060, bsc#1110439) + * Improve handling of changed WWIDs and temporary failure + to obtain WWID. Option "disable_changed_wwids" is now ignored. + * Fixes for PATH_PENDING state handling (bsc#1125043) + ------------------------------------------------------------------- Sat Apr 13 19:59:45 UTC 2019 - Jan Engelhardt diff --git a/multipath-tools.spec b/multipath-tools.spec index b9b2732..f218f0c 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -49,7 +49,7 @@ %define _sysdir usr/lib Name: multipath-tools -Version: 0.8.0+17+suse.a28893f +Version: 0.8.1+8+suse.8c11498 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only @@ -82,14 +82,6 @@ Requires(post): suse-module-tools Requires: device-mapper >= 1.2.78 Requires: kpartx Requires: sg3_utils -# Generate kmod(xyz)-style dependencies for modules that we put -# in modules-load.d. Use the modules.d file (Source1) as input to avoid -# maintaining these dependencies in several places. -# This feature is to be enabled for SLE15-SP1, and some time in the -# near future, for Factory. -%if 0%{?sle_version} >= 150100 -%(sed 's/^\s*//;s/\s*$//;/^#/d;/^$/d;s/^/Requires: kmod(/;s/$/)/;' %{S:1}) -%endif Obsoletes: multipath-tools-rbd <= %{version} PreReq: coreutils grep @@ -107,11 +99,11 @@ availability of the map devices. # and it loads prioritizers (to be fixed) and checkers. %package -n libmpath0 Summary: Libraries for multipath-tools +License: GPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later +Group: System/Libraries # This is for libmpathcmd, which is useless without multipathd. # No hard dependency here - we don't want to pull in all dependencies # of multipath-tools. -License: GPL-2.0-only AND LGPL-2.1-only AND LGPL-2.0-or-later -Group: System/Libraries Recommends: multipath-tools Conflicts: multipath-tools < 0.8.0