diff --git a/.gitignore b/.gitignore index 8f405bd..31596e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/perftest-4.5-0.12.ge93c538.tar.gz +SOURCES/perftest-4.5-0.20.gac7cca5.tar.gz diff --git a/.perftest.metadata b/.perftest.metadata index 853141e..d378329 100644 --- a/.perftest.metadata +++ b/.perftest.metadata @@ -1 +1 @@ -cb7c9f0c822c0881272785a17de61329e866a9de SOURCES/perftest-4.5-0.12.ge93c538.tar.gz +b8180b8e6117f1db9b7127c8a5295f4a5dfdb004 SOURCES/perftest-4.5-0.20.gac7cca5.tar.gz diff --git a/SPECS/perftest.spec b/SPECS/perftest.spec index 146a0a8..853d857 100644 --- a/SPECS/perftest.spec +++ b/SPECS/perftest.spec @@ -1,18 +1,23 @@ -Name: perftest -Summary: IB Performance Tests -Version: 4.5 -%define minor_release 0.12 -%define git_hash ge93c538 -Release: 12%{?dist} -License: GPLv2 or BSD -Source0: https://github.com/linux-rdma/perftest/releases/download/V%{version}-%{minor_release}/perftest-%{version}-%{minor_release}.%{git_hash}.tar.gz +Name: perftest +Summary: IB Performance Tests +# Upstream uses a dash in the version. Not valid in the Version field, so we use a dot instead. +# Issue "Please avoid dashes in version": +# https://github.com/linux-rdma/perftest/issues/18 +%global upstream_ver 4.5-0.20 +Version: %{lua: print((string.gsub(rpm.expand("%{upstream_ver}"),"-",".")))} +Release: 4%{?dist} +License: GPLv2 or BSD +Source: https://github.com/linux-rdma/perftest/releases/download/v4.5-0.20/perftest-4.5-0.20.gac7cca5.tar.gz Source1: ib_atomic_bw.1 -Url: https://github.com/linux-rdma/perftest -BuildRequires: libibverbs-devel > 1.1.4, librdmacm-devel > 1.0.14 -BuildRequires: libibumad-devel > 1.3.6 -BuildRequires: pciutils-devel -BuildRequires: autoconf, automake, libtool -Obsoletes: openib-perftest < 1.3 +Url: https://github.com/linux-rdma/perftest + +BuildRequires: make +BuildRequires: gcc +BuildRequires: libibverbs-devel >= 1.2.0 +BuildRequires: librdmacm-devel >= 1.0.21 +BuildRequires: libibumad-devel >= 1.3.10.2 +BuildRequires: pciutils-devel +Obsoletes: openib-perftest < 1.3 %description Perftest is a collection of simple test programs designed to utilize @@ -21,18 +26,18 @@ connections. It does not work on normal TCP/IP networks, only on RDMA networks. %prep -%setup -q -autoreconf --force --install +# The directory in the tarball has only the part before the dash. +%global tarball_ver %{lua: _,_,v=string.find(rpm.expand("%{upstream_ver}"),"([^-]+)"); print(v)} + +%setup -q -n %{name}-%{tarball_ver} +find src -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' %build %configure %make_build %install -for file in ib_{atomic,read,send,write}_{lat,bw}; do - install -D -m 0755 $file %{buildroot}%{_bindir}/$file -done -for file in raw_ethernet_{lat,bw}; do +for file in ib_{atomic,read,send,write}_{lat,bw} raw_ethernet_{lat,bw}; do install -D -m 0755 $file %{buildroot}%{_bindir}/$file done mkdir -p %{buildroot}%{_mandir}/man1/ @@ -45,11 +50,15 @@ popd %files %doc README -%{_bindir}/* %{_mandir}/man1/* %license COPYING +%_bindir/* %changelog +* Wed Feb 08 2023 Michal Schmidt - 4.5.0.20-4 +- Rebase to upstream version 4.5-0.20 +- Resolves: rhbz#2168109 + * Wed Nov 10 2021 Honggang Li - 4.5-12 - Rebase to upstream release perftest-4.5-0.12 - Resolves: rhbz#2020062