From 14e6850b0d12060452b1e9c05148bdca51bf9f3fa9c79c7ada089cbaba771860 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Wed, 27 Jan 2021 23:03:37 +0000 Subject: [PATCH 1/5] Accepting request 867325 from home:markkp:branches:network - Added a BuildRequires for bash-completion-devel so that the completion file for smc will be built and installed. (bsc#1181360) - Created a new sub-package, smc-tools-completion, to deliver the bash completion files. - Replaced the "make" command with the %make_build macro according to the recommendation from spec-cleaner. OBS-URL: https://build.opensuse.org/request/show/867325 OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=34 --- smc-tools.changes | 10 ++++++++++ smc-tools.spec | 19 +++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/smc-tools.changes b/smc-tools.changes index ee4ae50..2aacd51 100644 --- a/smc-tools.changes +++ b/smc-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 27 21:52:54 UTC 2021 - Mark Post + +- Added a BuildRequires for bash-completion-devel so that the + completion file for smc will be built and installed. (bsc#1181360) +- Created a new sub-package, smc-tools-completion, to deliver the + bash completion files. +- Replaced the "make" command with the %make_build macro according + to the recommendation from spec-cleaner. + ------------------------------------------------------------------- Mon Dec 7 22:10:32 UTC 2020 - Mark Post diff --git a/smc-tools.spec b/smc-tools.spec index 6721286..d6c4238 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -1,7 +1,7 @@ # # spec file for package smc-tools # -# Copyright (c) 2018-2020 SUSE LLC +# Copyright (c) 2018-2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,10 @@ URL: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html Source: %{name}-%{version}.tar.gz Source1: smc-tools-rpmlintrc +BuildRequires: bash-completion-devel BuildRequires: libnl3-devel PreReq: permissions +Recommends: %{name}-completion %description Shared Memory Communication via RDMA (SMC) is a socket over RDMA @@ -38,6 +40,16 @@ Converged Ethernet (RoCE) network. The tools provided in this package allow existing TCP applications to use a RoCE network without needing to make changes in them. +%package completion +Summary: Bash completion for smc-tools +Group: System/Kernel + +Requires: bash-completions + +%description completion +This package contains the files to enable command completion for the +smc-tools package when running a bash shell. + %prep %autosetup -p1 @@ -48,7 +60,7 @@ to use a RoCE network without needing to make changes in them. # parameters. MYCFLAGS=$(grep ^CFLAGS Makefile | head -n1 | cut -f2 -d=) MYCFLAGS+=" $(pkg-config --silence-errors --cflags libnl-genl-3.0)" -make %{?_smp_mflags} V=1 CFLAGS="${MYCFLAGS} %{optflags}" +%make_build CFLAGS="${MYCFLAGS} %{optflags}" %install %make_install V=1 @@ -92,4 +104,7 @@ rm -Rf "%{buildroot}%{_prefix}/lib64" %{_mandir}/man8/smcr.8%{?ext_man} %{_mandir}/man8/smcss.8%{?ext_man} +%files completion +%{_datadir}/bash-completion/completions/smc* + %changelog From df63bf1467e01deec98fe84a1731cddbd9e921f5675f8fca4f76bbe483145399 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 28 Jan 2021 14:31:10 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=35 --- smc-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smc-tools.spec b/smc-tools.spec index d6c4238..c5a9d50 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -44,7 +44,7 @@ to use a RoCE network without needing to make changes in them. Summary: Bash completion for smc-tools Group: System/Kernel -Requires: bash-completions +Requires: bash-completion %description completion This package contains the files to enable command completion for the From 821526d1a0825096dee9e9802b80aa31ee0adc50886905c492331a73bde561bd Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 28 Jan 2021 17:10:44 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=36 --- smc-tools.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/smc-tools.spec b/smc-tools.spec index c5a9d50..c5ea6d4 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -29,7 +29,6 @@ Source1: smc-tools-rpmlintrc BuildRequires: bash-completion-devel BuildRequires: libnl3-devel PreReq: permissions -Recommends: %{name}-completion %description Shared Memory Communication via RDMA (SMC) is a socket over RDMA @@ -44,7 +43,7 @@ to use a RoCE network without needing to make changes in them. Summary: Bash completion for smc-tools Group: System/Kernel -Requires: bash-completion +Supplements: (%{name} and bash-completion) %description completion This package contains the files to enable command completion for the From 35f83f52a6032494d2a105ddcd895bd9160f72e502ce5ca5b33d498703fbd560 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 28 Jan 2021 17:13:49 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=37 --- smc-tools.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/smc-tools.spec b/smc-tools.spec index c5ea6d4..0928fad 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -42,7 +42,8 @@ to use a RoCE network without needing to make changes in them. %package completion Summary: Bash completion for smc-tools Group: System/Kernel - +Requires: %{name} +Requires: bash-completion Supplements: (%{name} and bash-completion) %description completion From c02ecaff96cb76ae5c1be0bc24f6c0857e9d5674e99a401821773e7eb0a3cf8c Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 28 Jan 2021 17:14:45 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/network/smc-tools?expand=0&rev=38 --- smc-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/smc-tools.spec b/smc-tools.spec index 0928fad..c01a6d5 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -42,6 +42,7 @@ to use a RoCE network without needing to make changes in them. %package completion Summary: Bash completion for smc-tools Group: System/Kernel + Requires: %{name} Requires: bash-completion Supplements: (%{name} and bash-completion)