diff --git a/0.9.4.tar.gz b/0.9.4.tar.gz deleted file mode 100644 index b195ff3049d8d524099cfc8d3c610ae3e7e57a31..0000000000000000000000000000000000000000 Binary files a/0.9.4.tar.gz and /dev/null differ diff --git a/multipath-tools-0.9.5.tar.gz b/multipath-tools-0.9.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e38847b699957a7e0aa609f302a5041658650e46 Binary files /dev/null and b/multipath-tools-0.9.5.tar.gz differ diff --git a/device-mapper-multipath.spec b/multipath-tools.spec similarity index 84% rename from device-mapper-multipath.spec rename to multipath-tools.spec index 13716e83ae8b784e92a2ef5355f91578023e70da..b0abe4fce0ba9c9f43e8b1e6b2035e0dc6efd51b 100644 --- a/device-mapper-multipath.spec +++ b/multipath-tools.spec @@ -1,12 +1,12 @@ %define anolis_release 1 -Name: device-mapper-multipath -Version: 0.9.4 +Name: multipath-tools +Version: 0.9.5 Release: %{anolis_release}%{?dist} -Summary: Tools to manage multipath devices using device-mapper +Summary: Tools to manage multipath devices using multipath-tool License: GPLv2 URL: http://christophe.varoqui.free.fr/ -Source0: https://github.com/opensvc/multipath-tools/archive/%{version}.tar.gz +Source0: https://github.com/opensvc/multipath-tools/archive/%{name}-%{version}.tar.gz Source1: multipath.conf BuildRequires: libaio-devel, device-mapper-devel >= 1.02.89 @@ -22,6 +22,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: kpartx = %{version}-%{release} Requires: device-mapper >= 1.02.96 Requires: libmount +Requires: readline Requires: userspace-rcu Requires(post): systemd-units Requires(preun): systemd-units @@ -52,7 +53,7 @@ Requires: %{name}-libs = %{version}-%{release} %description devel This package contains the files need to develop applications that use -device-mapper-multipath's lbmpathpersist and libmpathcmd libraries. +multipath-tool's lbmpathpersist and libmpathcmd libraries. %package -n kpartx Summary: Partition device manager for device-mapper devices @@ -61,27 +62,27 @@ Summary: Partition device manager for device-mapper devices kpartx manages partition creation and removal for device-mapper devices. %package -n libdmmp -Summary: device-mapper-multipath C API library +Summary: multipath-tool C API library License: GPLv3+ Requires: json-c Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} %description -n libdmmp -This package contains the shared library for the device-mapper-multipath +This package contains the shared library for the multipath-tool C API library. %package -n libdmmp-devel -Summary: device-mapper-multipath C API library headers +Summary: multipath-tool C API library headers Requires: pkgconfig Requires: libdmmp = %{version}-%{release} %description -n libdmmp-devel This package contains the files needed to develop applications that use -device-mapper-multipath's libdmmp C API library +multipath-tool's libdmmp C API library %prep -%autosetup -n multipath-tools-%{version} +%autosetup -n multipath-tools-%{version} -p1 sed -i "s/echo \"-D_FORTIFY_SOURCE=3\"/echo \"-D_FORTIFY_SOURCE=2\"/g" create-config.mk cp %{SOURCE1} . @@ -89,7 +90,8 @@ cp %{SOURCE1} . %define _sbindir /usr/sbin %define _libdir /usr/%{_lib} #%define _udevdir /usr/lib/udev -%define _libmpathdir %{_libdir}/multipath +#%define _libmpathdir %{_libdir}/multipath +%define _libmpathdir /%{_lib}/multipath %define _pkgconfdir %{_libdir}/pkgconfig %make_build LIB=%{_lib} @@ -103,7 +105,8 @@ rm -rf $RPM_BUILD_ROOT rcdir=%{_initrddir} \ unitdir=%{_unitdir} \ includedir=%{_includedir} \ - pkgconfdir=%{_pkgconfdir} + pkgconfdir=%{_pkgconfdir} \ + tmpfilesdir=%{_tmpfilesdir} install -d %{buildroot}/etc/multipath rm -rf %{buildroot}/%{_initrddir} @@ -128,7 +131,7 @@ fi /bin/systemctl --quiet is-enabled multipathd.service >/dev/null 2>&1 && /bin/systemctl reenable multipathd.service ||: %files -%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0 +%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0 LICENSES/GPL-3.0 %{_sbindir}/multipath %{_sbindir}/multipathd %{_sbindir}/multipathc @@ -152,13 +155,17 @@ fi %doc multipath.conf %dir /etc/multipath %{abidir}/multipath-option.list +%{abidir}/mpathpersist-option.list %{abidir}/libcheck*.dump %{abidir}/libprio*.dump %{abidir}/libforeign-nvme.dump +%ifarch loongarch64 +%{abidir}/multipathd-option.list +%endif %files libs %dir %{abidir} -%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0 +%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0 LICENSES/LGPL-2.1 %doc README.md %{_libdir}/libmultipath.so %{_libdir}/libmultipath.so.* @@ -172,6 +179,7 @@ fi %{abidir}/libmpathcmd.dump %{abidir}/libmpathvalid.dump %{abidir}/libmpathutil.dump +%{_libmpathdir}/* %ldconfig_scriptlets libs @@ -214,6 +222,12 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog +* Wed Mar 13 2024 Kaiqiang Wang - 0.9.5-1 +- update to 0.9.5 + +* Fri Mar 08 2024 Kaiqiang Wang - 0.9.4-2 +- modify device-mapper-multipath to multipath-tools + * Sat May 06 2023 mgb01105731 - 0.9.4-1 - rebuild with libaio update