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

- Update to rdma-core v23.1
  - No release notes available
- Replace prebuild-pandoc.sh by post_download.sh to patch the spec
  file form upstream for OBS setup

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

_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">43adee5e3196fc1d1219fd1e66e54e7d18766d2d</param>
+    <param name="revision">352dd809dde8648949bb8ead9357dfe03bb8664e</param>
 	<param name="extract">suse/rdma-core.spec</param>
   </service>
   <service name="recompress" mode="disabled">

post_download.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# Script to be run after updating the spec file from a newer release
+
+# Enable pyverbs by default
+sed -i -e 's/^%define with_pyverbs .*$/%define with_pyverbs 1/' rdma-core.spec
+# Disable static
+sed -i -e 's/^%define with_static .*$/%define with_static 0/' rdma-core.spec
+
+# Fixup pandoc
+# To remove a build dependency to pandoc in the core rings, prebuild the pandoc
+# tarball and patch the spec file
+TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: |  awk '{ print $NF}')
+OUTDIR=$(tar tf $TARBALL | head -n 1)
+
+rm -Rf $OUTDIR
+tar xf $TARBALL
+cd $OUTDIR
+mkdir build
+cd build
+cmake ..
+make docs
+tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt
+cd ../..
+
+EXTRA_SOURCES="Source2:        post_download.sh\nSource3:        prebuilt-pandoc.tgz"
+PANDOC_SETUP="#Extract prebuilt pandoc file in the buildlib directory\n(cd buildlib && tar xf %{S:3})"
+sed -i -e '/Source1:/a '"$EXTRA_SOURCES" rdma-core.spec
+sed -i -e '/^BuildRequires:  pandoc/d' rdma-core.spec
+sed -i -e '/^%setup /a '"$PANDOC_SETUP" rdma-core.spec

prebuild-pandoc.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: |  awk '{ print $NF}')
-OUTDIR=$(tar tf $TARBALL | head -n 1)
-
-rm -Rf $OUTDIR
-tar xf $TARBALL
-cd $OUTDIR
-mkdir build
-cd build
-cmake ..
-make docs
-tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt

prebuilt-pandoc.tgz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54e72e4ad6909acc5c88fdf8b0046cc0484d216771415f744c4b14bfd2ef53ba
-size 27440
+oid sha256:b331609141df0c8afb4749d6ecffcf267b2fd97dd7847640ad36bea6eafc4c7c
+size 27413

rdma-core-23.0.43adee5e3196.tar.gz

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

rdma-core-23.1.0.352dd809dde8.tar.gz

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

rdma-core.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 13 08:20:59 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+- Update to rdma-core v23.1
+  - No release notes available
+- Replace prebuild-pandoc.sh by post_download.sh to patch the spec
+  file form upstream for OBS setup
+
 -------------------------------------------------------------------
 Fri Apr 19 06:08:06 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 

rdma-core.spec

@@ -18,12 +18,12 @@
 
 %bcond_without  systemd
 # Do not build static libs by default.
-%define with_static %{?_with_static: 1} %{?!_with_static: 0}
-%define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: 1}
+%define with_static 0
+%define with_pyverbs 1
 
-%define         git_ver .43adee5e3196
+%define         git_ver .0.352dd809dde8
 Name:           rdma-core
-Version:        23.0
+Version:        23.1
 Release:        0
 Summary:        RDMA core userspace libraries and daemons
 License:        GPL-2.0-only OR BSD-2-Clause
@@ -52,7 +52,7 @@ Group:          Productivity/Networking/Other
 Url:            https://github.com/linux-rdma/rdma-core
 Source:         rdma-core-%{version}%{git_ver}.tar.gz
 Source1:        baselibs.conf
-Source2:        prebuild-pandoc.sh
+Source2:        post_download.sh
 Source3:        prebuilt-pandoc.tgz
 BuildRequires:  binutils
 BuildRequires:  cmake >= 2.8.11
@@ -218,7 +218,6 @@ Requires:       libibverbs = %{version}
 %description -n %verbs_lname
 This package contains the ibverbs runtime library.
 
-%if 0%{?dma_coherent}
 %package -n %mlx4_lname
 Summary:        MLX4 runtime library
 Group:          System/Libraries
@@ -232,7 +231,6 @@ Group:          System/Libraries
 
 %description -n %mlx5_lname
 This package contains the mlx5 runtime library.
-%endif
 
 %package -n     libibverbs-utils
 Summary:        Examples for the libibverbs library
@@ -331,7 +329,6 @@ rdma-ndd is a system daemon which watches for rdma device changes and/or
 hostname changes and updates the Node Description of the rdma devices based
 on those changes.
 
-%if %{with_pyverbs}
 %package -n python3-pyverbs
 Summary:        Python3 API over IB verbs
 Group:          Development/Languages/Python
@@ -339,9 +336,10 @@ Group:          Development/Languages/Python
 %description -n python3-pyverbs
 Pyverbs is a Cython-based Python API over libibverbs, providing an
 easy, object-oriented access to IB verbs.
-%endif
 
 %prep
+# Make sure LTO is disable as rdma-core fails to compile with LTO enabled
+%define _lto_cflags %{nil}
 %setup -q -n  %{name}-%{version}%{git_ver}
 #Extract prebuilt pandoc file in the buildlib directory
 (cd buildlib && tar xf %{S:3})
@@ -400,7 +398,6 @@ mkdir -p %{buildroot}/%{_sysconfdir}/rdma
 %global dracutlibdir %%{_sysconfdir}/dracut.conf.d
 %global sysmodprobedir %%{_sysconfdir}/modprobe.d
 
-mkdir -p %{buildroot}%{_libexecdir}/udev/rules.d
 mkdir -p %{buildroot}%{_udevrulesdir}
 mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
 mkdir -p %{buildroot}%{sysmodprobedir}
@@ -436,13 +433,11 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %post -n %verbs_lname -p /sbin/ldconfig
 %postun -n %verbs_lname -p /sbin/ldconfig
 
-%if 0%{?dma_coherent}
 %post -n %mlx4_lname -p /sbin/ldconfig
 %postun -n %mlx4_lname -p /sbin/ldconfig
 
 %post -n %mlx5_lname -p /sbin/ldconfig
 %postun -n %mlx5_lname -p /sbin/ldconfig
-%endif
 
 %post -n %umad_lname -p /sbin/ldconfig
 %postun -n %umad_lname -p /sbin/ldconfig
@@ -522,12 +517,12 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %dir %{_sysconfdir}/rdma
 %dir %{_sysconfdir}/rdma/modules
 %dir %{_docdir}/%{name}-%{version}
-%dir %{_libexecdir}/udev
-%dir %{_libexecdir}/udev/rules.d
+%dir %{_udevrulesdir}
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
 %dir %{_sysconfdir}/modprobe.d
 %doc %{_docdir}/%{name}-%{version}/README.md
+%doc %{_docdir}/%{name}-%{version}/udev.md
 %config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/infiniband.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/iwarp.conf
@@ -591,7 +586,6 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
 %doc %{_docdir}/%{name}-%{version}/libibverbs.md
 %doc %{_docdir}/%{name}-%{version}/rxe.md
-%doc %{_docdir}/%{name}-%{version}/udev.md
 %doc %{_docdir}/%{name}-%{version}/tag_matching.md
 %{_bindir}/rxe_cfg
 %{_mandir}/man7/rxe*
@@ -696,7 +690,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %dir %{_sysconfdir}/rdma/modules
 %config(noreplace) %{_sysconfdir}/srp_daemon.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/srp_daemon.conf
-%{_libexecdir}/udev/rules.d/60-srp_daemon.rules
+%{_udevrulesdir}/60-srp_daemon.rules
 %{_libexecdir}/srp_daemon/start_on_all_ports
 %{_unitdir}/srp_daemon.service
 %{_unitdir}/srp_daemon_port@.service
@@ -716,7 +710,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %{_sbindir}/rcrdma-ndd
 %{_unitdir}/rdma-ndd.service
 %{_mandir}/man8/rdma-ndd.8*
-%{_libexecdir}/udev/rules.d/60-rdma-ndd.rules
+%{_udevrulesdir}/60-rdma-ndd.rules
 
 %if %{with_pyverbs}
 %files -n python3-pyverbs