Browse Source

device-mapper-multipath-0.9.2-1

Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
8df101b10c
1 changed files with 50 additions and 51 deletions
  1. 50 51
      d/device-mapper-multipath/device-mapper-multipath-vl.spec

+ 50 - 51
d/device-mapper-multipath/device-mapper-multipath-vl.spec

@@ -3,9 +3,9 @@
 Summary: Tools to manage multipath devices using device-mapper
 Summary(ja): Device-mapper を使用してマルチパスデバイスを管理するためのツール集
 Name: device-mapper-multipath
-Version: 0.8.2
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Base
+Version: 0.9.2
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -15,41 +15,24 @@ URL: http://christophe.varoqui.free.fr/
 # The source for this package was pulled from upstream's git repo.  Use the
 # following command to generate the tarball
 # curl "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=refs/tags/0.8.2;sf=tgz" -o multipath-tools-0.8.2.tgz
-Source0: multipath-tools-%{version}.tgz
+Source0: https://github.com/opensvc/multipath-tools/archive/refs/tags/%{version}.tar.gz#/multipath-tools-%{version}.tar.gz
 Source1: multipath.conf
 Source2: multipathd.init
 
-Patch0001: 0001-libmultipath-make-vector_foreach_slot_backwards-work.patch
-Patch0002: 0002-libmultipath-add-marginal-paths-and-groups-infrastru.patch
-Patch0003: 0003-tests-add-path-grouping-policy-unit-tests.patch
-Patch0004: 0004-libmultipath-add-wrapper-function-around-pgpolicyfn.patch
-Patch0005: 0005-tests-update-pgpolicy-tests-to-work-with-group_paths.patch
-Patch0006: 0006-libmultipath-fix-double-free-in-pgpolicyfn-error-pat.patch
-Patch0007: 0007-libmultipath-consolidate-group_by_-functions.patch
-Patch0008: 0008-libmultipath-make-pgpolicyfn-take-a-paths-vector.patch
-Patch0009: 0009-libmultipath-make-group_paths-handle-marginal-paths.patch
-Patch0010: 0010-tests-add-tests-for-grouping-marginal-paths.patch
-Patch0011: 0011-libmultipath-add-marginal_pathgroups-config-option.patch
-Patch0012: 0012-libmutipath-deprecate-delay_-_checks.patch
-Patch0013: 0013-multipathd-use-marginal_pathgroups.patch
-Patch0014: 0014-multipath-update-man-pages.patch
-Patch0015: 0015-multipath.conf-add-enable_foreign-parameter.patch
-Patch0016: 0016-multipath.conf.5-document-foreign-library-support.patch
-Patch0017: 0017-mpathpersist-remove-broken-unused-code.patch
-Patch0018: 0018-libmultipath-EMC-PowerMax-NVMe-device-config.patch
-Patch0019: 0019-mpathpersist-fix-leaks.patch
-Patch0020: 0020-libmultipath-fix-mpcontext-initialization.patch
-Patch0021: 0021-RH-fixup-udev-rules-for-redhat.patch
-Patch0022: 0022-RH-Remove-the-property-blacklist-exception-builtin.patch
-Patch0023: 0023-RH-don-t-start-without-a-config-file.patch
-Patch0024: 0024-RH-use-rpm-optflags-if-present.patch
-Patch0025: 0025-RH-add-mpathconf.patch
-Patch0026: 0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
-Patch0027: 0027-RH-warn-on-invalid-regex-instead-of-failing.patch
-Patch0028: 0028-RH-reset-default-find_mutipaths-value-to-off.patch
-Patch0029: 0029-RH-Fix-nvme-compilation-warning.patch
-Patch0030: 0030-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
-Patch0031: 0031-multipath-fix-issues-found-by-compiling-with-gcc-10.patch
+Patch0001: 0001-libmpathutil-move-devt2devname-to-libmultipath.patch
+Patch0002: 0002-libmpathutil-remove-udev-symbol.patch
+Patch0003: 0003-libmultipath-remove-duplicate-export-of-libmp_verbos.patch
+Patch0004: 0004-libmpathutil-remove-__attribute__-weak.patch
+Patch0005: 0005-libmultipath-libmpathutil-use-common-ABI-version-for.patch
+Patch0006: 0006-RH-don-t-start-without-a-config-file.patch
+Patch0007: 0007-RH-Fix-nvme-function-missing-argument.patch
+Patch0008: 0008-RH-use-rpm-optflags-if-present.patch
+Patch0009: 0009-RH-add-mpathconf.patch
+Patch0010: 0010-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+Patch0011: 0011-RH-reset-default-find_mutipaths-value-to-off.patch
+Patch0012: 0012-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
+Patch0013: 0013-RH-make-parse_vpd_pg83-match-scsi_id-output.patch
+Patch0014: 0014-RH-add-scsi-device-handlers-to-modules-load.d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel
@@ -80,6 +63,7 @@ The tools are :
 
 %package libs
 Summary: The %{name} modules and shared library
+Group: system
 # only libmpathcmd is LGPLv2+
 License: GPLv2 and LGPLv2+
 
@@ -92,6 +76,7 @@ libmultipath.
 
 %package devel
 Summary: Development libraries and headers for %{name}
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -103,7 +88,7 @@ device-mapper-multipath's lbmpathpersist and libmpathcmd libraries.
 %package -n kpartx
 Summary: Partition device manager for device-mapper devices
 Summary(ja): Device-mapper デバイス用のパーティションデバイスマネージャー
-Group: System Environment/Base
+Group: system
 Provides: kpartx = %{version}-%{release}
 
 %description -n kpartx
@@ -112,6 +97,7 @@ kpartx manages partition creation and removal for device-mapper devices.
 
 %package -n libdmmp
 Summary: device-mapper-multipath C API library
+Group: system
 License: GPLv3+
 Requires: json-c
 Requires: %{name} = %{version}-%{release}
@@ -123,6 +109,7 @@ C API library.
 
 %package -n libdmmp-devel
 Summary: device-mapper-multipath C API library headers
+Group: programming
 Requires: pkgconfig
 Requires: libdmmp = %{version}-%{release}
 
@@ -131,12 +118,13 @@ This package contains the files needed to develop applications that use
 device-mapper-multipath's libdmmp C API library
 
 
+%debug_package
+
+
 %prep
-%setup -q -n multipath-tools-0.8.2
+%setup -q -n multipath-tools-%{version}
 %autopatch -p1
 
-sed -i -e 's/ != TRUE/ == 0/g' libdmmp/libdmmp_private.h
-
 
 %build
 make %{?_smp_mflags} LIB=%{_lib} SYSTEMDPATH=/lib
@@ -158,9 +146,14 @@ make install \
 install -d %{buildroot}/etc/multipath
 install -m644 %{SOURCE1} %{buildroot}/etc/multipath.conf
 
-%if !%{with systemd}
+%if %{with systemd}
+mkdir -p %{buildroot}%{_tmpfilesdir}
+mv %{buildroot}/lib/tmpfiles.d/* %{buildroot}%{_tmpfilesdir}/
+%else
 install -d %{buildroot}%{_initdir}
 install -m755 %{SOURCE2} %{buildroot}%{_initdir}/multipathd
+rm -rf %{buildroot}/lib/tmpfiles.d
+rm -rf %{buildroot}/lib/modules-load.d
 %endif
 
 %clean
@@ -202,25 +195,21 @@ if [ "$1" -ge "1" ]; then
 fi
 %endif
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post -n libdmmp -p /sbin/ldconfig
-%postun -n libdmmp -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
 %license LICENSES/GPL-2.0 LICENSES/LGPL-2.0
 %doc README*
-%config /lib/udev/rules.d/62-multipath.rules
-%config /lib/udev/rules.d/11-dm-mpath.rules
+%config /lib/udev/rules.d/*-multipath.rules
+%config /lib/udev/rules.d/*-dm-mpath.rules
 %{_syssbindir}/multipath
+%{_syssbindir}/multipathc
 %{_syssbindir}/multipathd
 %{_syssbindir}/mpathconf
 %{_syssbindir}/mpathpersist
 %{_mandir}/man5/multipath.conf.5.gz
 %{_mandir}/man8/multipath.8.gz
+%{_mandir}/man8/multipathc.8.gz
 %{_mandir}/man8/multipathd.8.gz
 %{_mandir}/man8/mpathconf.8.gz
 %{_mandir}/man8/mpathpersist.8.gz
@@ -229,6 +218,8 @@ fi
 %if %{with systemd}
 %{_unitdir}/multipathd.service
 %{_unitdir}/multipathd.socket
+%{_tmpfilesdir}/*
+/lib/modules-load.d/*
 %else
 %config /etc/rc.d/init.d/multipathd
 %endif
@@ -240,6 +231,10 @@ fi
 /%{_lib}/libmultipath.so.*
 /%{_lib}/libmpathpersist.so.*
 /%{_lib}/libmpathcmd.so.*
+/%{_lib}/libmpathutil.so
+/%{_lib}/libmpathutil.so.*
+/%{_lib}/libmpathvalid.so
+/%{_lib}/libmpathvalid.so.*
 %dir /%{_lib}/multipath
 /%{_lib}/multipath/*
 
@@ -249,6 +244,7 @@ fi
 /%{_lib}/libmpathcmd.so
 %{_includedir}/mpath_cmd.h
 %{_includedir}/mpath_persist.h
+%{_includedir}/mpath_valid.h
 %{_mandir}/man3/mpath_persistent_reserve_in.3.gz
 %{_mandir}/man3/mpath_persistent_reserve_out.3.gz
 
@@ -258,9 +254,9 @@ fi
 %doc README
 %{_syssbindir}/kpartx
 /lib/udev/kpartx_id
-%config /lib/udev/rules.d/11-dm-parts.rules
-%config /lib/udev/rules.d/66-kpartx.rules
-%config /lib/udev/rules.d/68-del-part-nodes.rules
+%config /lib/udev/rules.d/*-dm-parts.rules
+%config /lib/udev/rules.d/*-kpartx.rules
+%config /lib/udev/rules.d/*-del-part-nodes.rules
 %{_mandir}/man8/kpartx.8.gz
 
 %files -n libdmmp
@@ -279,6 +275,9 @@ fi
 
 
 %changelog
+* Wed Oct 26 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.2-1
+- new upstream release.
+
 * Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.2-2
 - rebuilt with json-c-0.14.
 - added systemd support (disabled as default).