Accepting request 1120229 from Base:System

- Update to version 0.9.6+115+suse.07776fb
  * multipathd: Added support to handle FPIN-Li events for FC-NVMe

- Update to version 0.9.6+110+suse.5dfdf35:
  * The options "bindings_file", "prkeys_file", and "wwids_file",
    which have been deprecated since multipath-tools 0.8.8,
    aren't supported any more. The paths to these files are now
    hard-coded to "bindings", "prkeys" and "wwids" under
    /etc/multipath.
  * Strictly avoid assigning map aliases that are already taken
    (bsc#1213265)
  * Improve handling of user-friendly names
  * avoid "multipath -d" (dry-run) changing SCSI timeouts in sysfs
    (bsc#1213809)
- spec file:
  * adapt prefix values to upstream changes
  * fix compilation flags for "make check"
  * pass EXTRAVERSION to build (forwarded request 1120227 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/1120229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=156

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-              <param name="changesrevision">f07325e85d5d9444ac4c816f75d2ce67af52af93</param></service></servicedata>
+              <param name="changesrevision">07776fbb60471c83dda3f463d3c02cc67a921aef</param></service></servicedata>

multipath-tools-0.9.6+115+suse.07776fb.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e587a3565cd564cbf2b21aa8c2aad330601e618d82dcd9bb1c85dc0d87008c17
+size 2833420

multipath-tools.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Oct 25 10:46:30 UTC 2023 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 0.9.6+115+suse.07776fb
+  * multipathd: Added support to handle FPIN-Li events for FC-NVMe
+
+-------------------------------------------------------------------
+Fri Sep 15 12:36:30 UTC 2023 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 0.9.6+110+suse.5dfdf35:
+  * The options "bindings_file", "prkeys_file", and "wwids_file",
+    which have been deprecated since multipath-tools 0.8.8,
+    aren't supported any more. The paths to these files are now
+    hard-coded to "bindings", "prkeys" and "wwids" under
+    /etc/multipath.
+  * Strictly avoid assigning map aliases that are already taken
+    (bsc#1213265)
+  * Improve handling of user-friendly names
+  * avoid "multipath -d" (dry-run) changing SCSI timeouts in sysfs
+    (bsc#1213809)
+- spec file:
+  * adapt prefix values to upstream changes
+  * fix compilation flags for "make check"
+  * pass EXTRAVERSION to build
+
 -------------------------------------------------------------------
 Tue Sep 12 06:48:40 UTC 2023 - Martin Wilck <mwilck@suse.com>
 

multipath-tools.obsinfo

@@ -1,4 +1,4 @@
 name: multipath-tools
-version: 0.9.6+71+suse.f07325e
+version: 0.9.6+115+suse.07776fb
-mtime: 1694069633
+mtime: 1698230447
-commit: f07325e85d5d9444ac4c816f75d2ce67af52af93
+commit: 07776fbb60471c83dda3f463d3c02cc67a921aef

multipath-tools.spec

@@ -21,8 +21,8 @@
 
 # multipath-tools auto-detects support for -D_FORTFY_SOURCE.
 # This will lead to a compilation error if the distro overrides
-# -D_FORTIFY_SOURCE in optflags, unless we precede it with -U
+# -D_FORTIFY_SOURCE in optflags, unless it's preceded with -U_FORTIFY_SOURCE
-%global mp_optflags %(echo %{optflags} | sed 's/-D_FORTIFY_SOURCE=[0-9]/-U_FORTIFY_SOURCE &/')
+%global mp_optflags %(echo %{optflags} | sed '/-U_FORTIFY_SOURCE/!s/-D_FORTIFY_SOURCE=[0-9]/-U_FORTIFY_SOURCE &/')
 
 # Whether to build libdmmp - default YES
 %bcond_without libdmmp
@@ -35,7 +35,7 @@
 %define libdmmp_version %(echo %{_libdmmp_version} | tr . _)
 
 Name:           multipath-tools
-Version:        0.9.6+71+suse.f07325e
+Version:        0.9.6+115+suse.07776fb
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 License:        GPL-2.0-only AND GPL-3.0-or-later
@@ -87,9 +87,6 @@ monitors path devices for failure, removal, or addition, and applies
 the necessary changes to the multipath maps to ensure continuous
 availability of the map devices.
 
-
-
-
 # Currently, it makes no sense to split out libmpathpersist and libmpathcmd
 # separately. libmultipath has no stable API at all, and it depends
 # on libmpathcmd (to be fixed). libmpathpersist depends on libmultipath
@@ -149,17 +146,19 @@ Requires:       libdmmp%{libdmmp_version} = %{version}
 %description -n libdmmp-devel
 This package provides development files and documentation for libdmmp.
 
-%define makeflags %{!?with_libdmmp:ENABLE_LIBDMMP=0}
+%global extraversion %(echo %{version} | sed 's/^[^+]*//')
+%define makeflags EXTRAVERSION="%{extraversion}" %{!?with_libdmmp:ENABLE_LIBDMMP=0}
 %if 0%{?suse_version} < 1550
-%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} systemd_prefix=%{_prefix}
+%define dirflags LIB=%{_lib} usr_prefix=%{_prefix}
 %define sbindir /sbin
 %define libdir  /%{_lib}
 %else
-%define dirflags LIB=%{_lib} prefix=%{_prefix} configdir=%{_sysconfdir}/multipath/conf.d
+%define dirflags LIB=%{_lib} prefix=%{_prefix} etc_prefix=
 %define sbindir %{_sbindir}
 %define libdir  %{_libdir}
 %endif
 
+
 %prep
 %setup -q -n multipath-tools-%{version}
 cp %{SOURCE4} .
@@ -172,7 +171,7 @@ cp %{SOURCE5} .
 
 %if 0%{?with_check} == 1
 %check
-%{make_build} OPTFLAGS="%{mp_optflags}" V=1 test
+%{make_build} OPTFLAGS="%{mp_optflags}" %{dirflags} %{makeflags} V=1 test
 %endif
 
 %install