DAOS-6803 ofi: Update to ofi v1.12.0rc1 (#34)

- Update to v1.12.0rc1 Signed-off-by: Alexander A Oganezov <alexander.a.oganezov@intel.com>
daos-stack · Feb 19, 2021 · c04a379 · c04a379
1 parent 872f06f
commit c04a379
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 8 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+libfabric (1.12.0~rc1-1) unstable; urgency=medium
+  [ Alexander Oganezov ]
+  * Update to 1.12.0rc1
+
+ -- Alexander Oganezov <alexander.a.oganezov@intel.com>  Tue, 16 Feb 2021 13:54:52 -0400
+
 libfabric (1.11.1-1) unstable; urgency=medium
   [ Brian J. Murrell ]
   * Update to 1.11.1

diff --git a/debian/libfabric1.symbols b/debian/libfabric1.symbols
@@ -3,6 +3,7 @@ libfabric.so.1 libfabric1 #MINVER#
  FABRIC_1.1@FABRIC_1.1 1.5.0
  FABRIC_1.2@FABRIC_1.2 1.9.0-2
  FABRIC_1.3@FABRIC_1.3 1.9.0-2
+ FABRIC_1.4@FABRIC_1.4 1.12.0~rc1-1
  fi_dupinfo@FABRIC_1.0 1.2.0
  fi_dupinfo@FABRIC_1.1 1.5.0
  fi_dupinfo@FABRIC_1.2 1.9.0-2
@@ -25,4 +26,5 @@ libfabric.so.1 libfabric1 #MINVER#
  fi_param_get@FABRIC_1.0 1.2.0
  fi_strerror@FABRIC_1.0 1.2.0
  fi_tostr@FABRIC_1.0 1.2.0
- fi_version@FABRIC_1.0 1.2.0
+ fi_tostr_r@FABRIC_1.4 1.12.0~rc1-1
+ fi_version@FABRIC_1.0 1.2.0
diff --git a/libfabric.spec b/libfabric.spec
@@ -1,10 +1,12 @@
 %define suse_libname libfabric1
-#global dl_version 1.11.1rc1
-
-%{?dl_version:%global autosetup_args --p1 -n libfabric-%{dl_version}}
+%global major 1
+%global minor 12
+%global bugrelease 0
+%global prerelease rc1
+%global dl_version %{major}.%{minor}.%{bugrelease}%{?prerelease:%{prerelease}}
 
 Name: libfabric
-Version: 1.11.1
+Version: %{major}.%{minor}.%{bugrelease}%{?prerelease:~%{prerelease}}
 Release: 1%{?dist}
 Summary: User-space RDMA Fabric Interfaces
 %if 0%{?suse_version} >= 1315
@@ -15,7 +17,7 @@ Group: System Environment/Libraries
 License: GPLv2 or BSD
 %endif
 Url: https://www.github.com/ofiwg/libfabric
-Source: https://github.com/ofiwg/%{name}/archive/v%{?dl_version}%{!?dl_version:%version}.tar.gz
+Source: https://github.com/ofiwg/%{name}/archive/v%{dl_version}.tar.gz
 
 %if 0%{?rhel} >= 7
 BuildRequires: librdmacm-devel >= 1.0.16
@@ -82,7 +84,7 @@ Requires: libpsm2-devel >= 11.2.78
 Development files for the libfabric library.
 
 %prep
-%autosetup %autosetup_args
+%autosetup -p1 -n libfabric-%dl_version
 
 %build
 if [ ! -f configure ]; then
@@ -144,6 +146,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_mandir}/man7/*
 
 %changelog
+* Tue Feb 16 2021 Alexander Oganezov <alexander.a.oganezov@intel.com> - 1.12.0~rc1-1
+- Update to v1.12.0rc1
+
 * Tue Nov 24 2020 Brian J. Murrell <brian.murrell@intel.com> - 1.11.1-1
 - Update to 1.11.1 GA
 - Make the use of %%{dl_verison} more automatic

diff --git a/packaging/Makefile b/packaging/Makefile
@@ -0,0 +1,11 @@
+NAME    := libfabric
+SRC_EXT := gz
+SOURCE   = https://github.com/ofiwg/$(NAME)/archive/v$(VERSION).tar.$(SRC_EXT)
+
+OSUSE_HPC_REPO := https://download.opensuse.org/repositories/science:/HPC
+
+ifeq ($(DAOS_STACK_LEAP_15_GROUP_REPO),)
+LEAP_15_REPOS := $(OSUSE_HPC_REPO)/openSUSE_Leap_$(lsb_release -s -r)/
+endif
+
+include Makefile_packaging.mk
diff --git a/packaging/Makefile_packaging.mk b/packaging/Makefile_packaging.mk
@@ -131,7 +131,7 @@ _topdir/SOURCES/%: % | _topdir/SOURCES/
 # At least one spec file, SLURM (sles), has a different version for the
 # download file than the version in the spec file.
 ifeq ($(DL_VERSION),)
-DL_VERSION = $(VERSION)
+DL_VERSION = $(subst ~,,$(VERSION))
 endif
 ifeq ($(DL_NAME),)
 DL_NAME = $(NAME)
@@ -390,6 +390,9 @@ show_common_rpm_args:
 show_version:
 	@echo '$(VERSION)'
 
+show_dl_version:
+	@echo '$(DL_VERSION)'
+
 show_release:
 	@echo '$(RELEASE)'