[infiniband-diags] Build on ARM, Cleanup and modernise spec

Peter Robinson pbrobinson at fedoraproject.org
Sat Mar 2 08:53:04 UTC 2013


commit b78eb009e3655c77f91fcd6f1489156ae4a5c4a0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 2 08:52:55 2013 +0000

    Build on ARM, Cleanup and modernise spec

 infiniband-diags.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index 2cc8f33..599bbe9 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,18 +1,18 @@
 Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
 Name: infiniband-diags 
 Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?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
 #Patch0: infiniband-diags-1.5.8-all_hcas.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: opensm-devel > 3.3.8, libibumad-devel, libibmad-devel, perl
 Provides: perl(IBswcountlimits)
 Obsoletes: openib-diags < 1.3
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
 
 # Find the correct directory to install the perl module into.
 %global _perldir %(perl -e 'use Config; print $Config{installvendorarch};')
@@ -46,20 +46,15 @@ Static libraries for the infiniband-diags library.
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_sbindir}/*.{pl,sh}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %{_sbindir}/*
 %{_mandir}/man8/*.8*
 %{_libdir}/libibnetdisc.so.*
@@ -69,16 +64,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_perldir}/IBswcountlimits.pm
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_mandir}/man3/*
 
 %files devel-static
-%defattr(-,root,root)
 %{_libdir}/*.a
 
 %changelog
+* Sat Mar  2 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.6.1-3
+- Build on ARM
+- Cleanup and modernise spec
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list