DAOS-13378 build: fix libfabric/libfabric1 dependency mismatch on SuSE (

#12134)

Leap 15 was improperly pinned

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>

debian/changelog

@@ -1,3 +1,9 @@
+daos (2.3.107-3) unstable; urgency=medium
+  [ Jerome Soumagne ]
+  * Fix libfabric/libfabric1 dependency mismatch on SuSE
+
+ -- Jerome Soumagne <jerome.soumagne@intel.com> Mon, 15 May 2023 10:30:00 -0600
+
 daos (2.3.107-2) unstable; urgency=medium
   [ Jerome Soumagne ]
   * Temporarily pin libfabric to < 1.18

utils/rpms/daos.spec

@@ -16,7 +16,7 @@
 
 Name:          daos
 Version:       2.3.107
-Release:       2%{?relval}%{?dist}
+Release:       3%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -140,14 +140,15 @@ Requires: ndctl
 %if (0%{?suse_version} >= 1500)
 Requires: ipmctl >= 03.00.00.0423
 Requires: libpmemobj1 >= 1.12.1~rc1-1.suse1500
+Requires: libfabric1 >= %{libfabric_version}, libfabric1 < %{libfabric_max_version}
 %else
 Requires: ipmctl >= 03.00.00.0468
 Requires: libpmemobj >= 1.12.1~rc1-1%{?dist}
 %endif
+Requires: libfabric >= %{libfabric_version}, libfabric < %{libfabric_max_version}
 Requires: mercury >= %{mercury_version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: libfabric >= %{libfabric_version}, libfabric < %{libfabric_max_version}
 Requires: numactl
 %{?systemd_requires}
 
@@ -165,13 +166,14 @@ This package contains DAOS administrative tools (e.g. dmg).
 Summary: The DAOS client
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: mercury >= %{mercury_version}
-Requires: libfabric >= %{libfabric_version}, libfabric < %{libfabric_max_version}
 %if (0%{?rhel} >= 8)
 Requires: fuse3 >= 3
 %else
 Requires: fuse3 >= 3.4.2
 %endif
+Requires: libfabric >= %{libfabric_version}, libfabric < %{libfabric_max_version}
 %if (0%{?suse_version} >= 1500)
+Requires: libfabric1 >= %{libfabric_version}, libfabric1 < %{libfabric_max_version}
 Requires: libfuse3-3 >= 3.4.2
 %else
 # because our repo has a deprecated fuse-3.x RPM, make sure we don't
@@ -554,6 +556,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
+* Mon May 15 2023 Jerome Soumagne <jerome.soumagne@intel.com> 2.3.107-3
+- Fix libfabric/libfabric1 dependency mismatch on SuSE
+
 * Wed May 10 2023 Jerome Soumagne <jerome.soumagne@intel.com> 2.3.107-2
 - Temporarily pin libfabric to < 1.18