From 3b156b183eaf49d08bbe8f53117a5e9de771285615b8ac8f8c880e253853f029 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 30 Nov 2018 21:39:38 +0000 Subject: [PATCH] Accepting request 653155 from home:markkp:branches:network - Made multiple changes to the spec file based on the output from spec-cleaner. - Upgraded to version 1.1.0 (Fates 325009, 325168 and 325702) Changes: * smcss: Add IPv6 support * preload: Add IPv6 support * smcss: Output format changed * preload: Rename preload library into libsmc-preload.so * Makefile: Improve distro compatibility * Makefile: Add SONAME to shared libraries * Makefile: Do not strip binaries on install * Makefile: Use LDFLAGS to allow addition of externally set link flags * libsmc..: Remove hardcoded reference to libc * Manpages: Formatting changes Bug fixes: * Makefile: Fix target 'install' dependencies * smcss: Fix "--version" output * smc_pnet: Fix "--version" output * smc_run: Append preload library to LD_PRELOAD instead of potentially overwriting pre-set values * preload: Set suid flag to work with suid executables - Updated the spec file to reference the new names for the shared library. - Removed the ExcludeArch for %{arm} since it now builds on that architecture. - Added an ExcludeArch for %{arm} so that we won't try to build the package on armv7l. The build fails on that architecture. - Update summary. Replace old RPM shell variables by macros. - Upgraded to version 1.0.0 (Fate#322376). - Initial packaging of version 0.1.1 (Fate#319569). OBS-URL: https://build.opensuse.org/request/show/653155 OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=19 --- smc-tools.changes | 8 ++++++- smc-tools.spec | 58 ++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/smc-tools.changes b/smc-tools.changes index c6a2bfb..08deaa8 100644 --- a/smc-tools.changes +++ b/smc-tools.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 30 21:11:45 UTC 2018 - mpost@suse.com + +- Made multiple changes to the spec file based on the output + from spec-cleaner. + ------------------------------------------------------------------- Fri Jul 27 20:40:30 UTC 2018 - mpost@suse.com -- Upgraded to version 1.1.0 (Fates 325009 and 325168) +- Upgraded to version 1.1.0 (Fates 325009, 325168 and 325702) Changes: * smcss: Add IPv6 support * preload: Add IPv6 support diff --git a/smc-tools.spec b/smc-tools.spec index b1cb12f..6e14fac 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -12,36 +12,37 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Name: smc-tools -Version: 1.1.0 -Release: 0 -Url: https://www.ibm.com/developerworks/linux/linux390/ -Summary: Shared Memory Communication via RDMA -License: EPL-1.0 -Group: System/Kernel -Source: %{name}-%{version}.tar.gz -Source1: smc-tools-rpmlintrc - # aarch64 and ppc64le don't support 32bit applications, so there's no # gcc-32bit package that can be installed %ifarch s390x x86_64 -BuildRequires: gcc-32bit %define have_32bit 1 +BuildRequires: gcc-32bit %endif -BuildRequires: libnl3-devel -PreReq: permissions # While repos other than Factory have 32bit for s390x, Factory does not -%if 0%{?suse_version} == 1330 +%if 0%{?suse_version} == 1550 %ifarch s390x %define have_32bit 0 %endif %endif +Name: smc-tools +Version: 1.1.0 +Release: 0 +Summary: Shared Memory Communication via RDMA +License: EPL-1.0 +Group: System/Kernel +URL: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html +Source: %{name}-%{version}.tar.gz +Source1: smc-tools-rpmlintrc + +BuildRequires: libnl3-devel +PreReq: permissions + %description Shared Memory Communication via RDMA (SMC) is a socket over RDMA communication protocol that allows existing TCP socket applications to @@ -52,40 +53,41 @@ The tools provided in this package allow existing TCP applications to use a RoCE network without needing to make changes in them. %prep -%setup +%setup -q %build MYCFLAGS=$(grep ^CFLAGS Makefile | cut -f2 -d=) -make CFLAGS="${MYCFLAGS} %{optflags}" +make %{?_smp_mflags} V=1 CFLAGS="${MYCFLAGS} %{optflags}" %install -%make_install +%make_install V=1 -%ifarch s390 %{ix86} -rm -Rf "%{buildroot}/usr/lib64" +%ifarch s390 %{ix86} +rm -Rf "%{buildroot}%{_prefix}/lib64" %endif %verifyscript -%verify_permissions -e /usr/lib/libsmc-preload.so +%verify_permissions -e %{_prefix}/lib/libsmc-preload.so %verify_permissions -e %{_libdir}/libsmc-preload.so %post -%set_permissions /usr/lib/libsmc-preload.so +%set_permissions %{_prefix}/lib/libsmc-preload.so %set_permissions %{_libdir}/libsmc-preload.so %files %defattr(-,root,root) -%doc README.smctools LICENSE +%license LICENSE +%doc README.smctools %{_bindir}/smc_pnet %{_bindir}/smc_run %{_bindir}/smcss %{_libdir}/libsmc-preload.so %if 0%{?have_32bit} -/usr/lib/libsmc-preload.so +%{_prefix}/lib/libsmc-preload.so %endif -%{_mandir}/man7/af_smc.7%{ext_man} -%{_mandir}/man8/smc_pnet.8%{ext_man} -%{_mandir}/man8/smc_run.8%{ext_man} -%{_mandir}/man8/smcss.8%{ext_man} +%{_mandir}/man7/af_smc.7%{?ext_man} +%{_mandir}/man8/smc_pnet.8%{?ext_man} +%{_mandir}/man8/smc_run.8%{?ext_man} +%{_mandir}/man8/smcss.8%{?ext_man} %changelog