Accepting request 657866 from home:NMoreyChaisemartin:branches:science:HPC

- Update to rdma-core v21 (fate#325939, fate#326991)
  * No release notes available

OBS-URL: https://build.opensuse.org/request/show/657866
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=98

_service

@@ -8,7 +8,7 @@
     <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
-    <param name="revision">222fa83a789cd24a1e0900389587d47812fba086</param>
+    <param name="revision">a4b744d2cd6e5ccb0c9e60ebaf681184dadb6da0</param>
 	<param name="extract">suse/rdma-core.spec</param>
   </service>
   <service name="recompress" mode="disabled">

prebuilt-pandoc.tgz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd18e775f46c48e30c534d27b59471ea8073f86a510a2638dad6fff554c5c5be
-size 16111
+oid sha256:40a73b4d11715965806b0d7298f5ddac129fb0be830a708d5ccb459d794190b0
+size 23267

rdma-core-20.1.0.222fa83a789c.tar.gz

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

rdma-core-21.0.a4b744d2cd6e.tar.gz

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

rdma-core.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 06:54:33 UTC 2018 - nmoreychaisemartin@suse.com
+
+- Update to rdma-core v21 (fate#325939, fate#326991)
+  * No release notes available
+
 -------------------------------------------------------------------
 Mon Oct 15 08:15:29 UTC 2018 - nmoreychaisemartin@suse.com
 

rdma-core.spec

@@ -17,9 +17,12 @@
 
 
 %bcond_without  systemd
-%define         git_ver .0.222fa83a789c
+# Do not build static libs by default.
+%define with_static %{?_with_static: 1} %{?!_with_static: 0}
+
+%define         git_ver .0.a4b744d2cd6e
 Name:           rdma-core
-Version:        20.1
+Version:        21
 Release:        0
 Summary:        RDMA core userspace libraries and daemons
 License:        GPL-2.0-only OR BSD-2-Clause
@@ -144,6 +147,13 @@ Obsoletes:      librdmacm-devel < %{version}-%{release}
 #Requires:       ibacm = %%{version}-%%{release}
 Provides:       ibacm-devel = %{version}-%{release}
 Obsoletes:      ibacm-devel < %{version}-%{release}
+%if %{with_static}
+# Since our pkg-config files include private references to these packages they
+# need to have their .pc files installed too, even for dynamic linking, or
+# pkg-config breaks.
+BuildRequires:  pkgconfig(libnl-3.0)
+BuildRequires:  pkgconfig(libnl-route-3.0)
+%endif
 
 %description devel
 RDMA core development libraries and headers.
@@ -351,6 +361,9 @@ on those changes.
          -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
          -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
          -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
+%if %{with_static}
+         -DENABLE_STATIC=1 \
+%endif
          %{EXTRA_CMAKE_FLAGS}
 %make_jobs
 
@@ -529,6 +542,9 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %dir %{_includedir}/rdma
 %{_includedir}/infiniband/*
 %{_includedir}/rdma/*
+%if %{with_static}
+%{_libdir}/lib*.a
+%endif
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/ibv_*