From a94fe80e39662f35f5d40a8d5bcd967c18cee394 Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Aug 28 2017 01:35:13 +0000
Subject: Disable support for ARM32 and s390


- Update source URL
- Disable support for ARM32
- Disable support for s390 as rdma-core is unavailable for s390
- Remove rdma-ndd as it had been merged into rdma-core
- Resolves: bz1484155

Signed-off-by: Honggang Li <honli@redhat.com>

---

diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index f5cb009..d6865cc 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,13 +1,12 @@
 Name:    infiniband-diags 
 Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
 Version: 1.6.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Upstream allows either license to be used
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 Url:     http://openfabrics.org/
-Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
-Source1: rdma-ndd.service
+Source0: https://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
 
 Patch1: infiniband-diags-1.6.1-hostname.patch
 
@@ -21,10 +20,7 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 Provides: perl(IBswcountlimits)
 Obsoletes: openib-diags < 1.3
-
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+ExcludeArch: s390 %{arm}
 
 # Find the correct directory to install the perl module into.
 %global _perldir %(perl -e 'use Config; print $Config{installvendorarch};')
@@ -59,22 +55,16 @@ make
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/rdma-ndd.service
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_sbindir}/*.{pl,sh}
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/rdma-ndd
+rm -f $RPM_BUILD_ROOT%{_sbindir}/rdma-ndd
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/rdma-ndd.8*
+rm -f $RPM_BUILD_ROOT%{_unitdir}/rdma-ndd.service
 
-%post
-%systemd_post rdma-ndd.service
-/sbin/ldconfig
-
-%preun
-%systemd_preun rdma-ndd.service
-
-%postun
-%systemd_postun_with_restart rdma-ndd.service
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %{_sbindir}/*
@@ -84,7 +74,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/rdma-ndd
 %config(noreplace) %{_sysconfdir}/infiniband-diags/*
 %doc README ChangeLog
 %license COPYING
-%{_unitdir}/rdma-ndd.service
 %{_perldir}/IBswcountlimits.pm
 
 %files devel
@@ -96,6 +85,13 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/rdma-ndd
 %{_libdir}/*.a
 
 %changelog
+* Sat Aug 26 2017 Honggang Li <honli@redhat.com> - 1.6.7-5
+- Update source URL
+- Disable support for ARM32
+- Disable support for s390 as rdma-core is unavailable for s390
+- Remove rdma-ndd as it had been merged into rdma-core
+- Resolves: bz1484155
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild