[udunits] Improve arch directives

[Peter Robinson]

commit 59825bb6eef77b8e39b4abaaa535fe78e02d9be2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Jun 20 17:23:33 2014 +0100

    Improve arch directives

 udunits.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/udunits.spec b/udunits.spec
index f89f3ff..d489e33 100644
--- a/udunits.spec
+++ b/udunits.spec
@@ -1,6 +1,6 @@
 Name: udunits
 Version: 1.12.11
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
@@ -54,7 +54,7 @@ A perl module for udunits.
 %setup -q
 %patch0 -p1 -b .linuxfixes
 # Yes, this is a dirty hack.
-%ifarch x86_64 ppc64 sparc64 s390x
+%if %{__isa_bits} == 64
 %patch1 -p1
 %endif
 
@@ -75,8 +75,9 @@ rm -rf %{buildroot}%{_mandir}/man3f
 # Handle multilib
 # Rename udunits.inc to udunits-<arch>.inc to avoid file conflicts on multilib systems and install wrapper include file
 # udunits-wrapper.inc as udunits.inc
-%ifarch %{ix86} x86_64 ia64 sparc sparcv9 sparc64 s390 s390x ppc ppc64
+%ifarch x86_64 ia64 sparc64 s390 s390x ppc %{power64} aarch64
 basearch=%{_arch}
+%endif
 # always use i386 for iX86
 %ifarch %{ix86}
 basearch=i386
@@ -84,25 +85,19 @@ basearch=i386
 %ifarch sparcv9
 basearch=sparc
 %endif
-%ifarch sparc64
-basearch=sparc64
-%endif
 # Rename files and install wrappers
 mv %{buildroot}%{_includedir}/udunits.inc %{buildroot}%{_includedir}/udunits-${basearch}.inc
 install -m644 %{SOURCE1} %{buildroot}%{_includedir}/udunits.inc
-%endif
 
 find %{buildroot} \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 
 %files
-%defattr(-,root,root)
 %doc COPYRIGHT README RELEASE_NOTES VERSION
 %{_bindir}/udunits
 %{_mandir}/man1/udunits.1.gz
 %config(noreplace) %{_sysconfdir}/udunits.dat
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/udunits.h
 %{_includedir}/udunits*.inc
 %{_libdir}/libudport.a
@@ -111,7 +106,6 @@ find %{buildroot} \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 %{_mandir}/man3/udunits.3f.gz
 
 %files -n perl-udunits
-%defattr(-,root,root)
 %{perl_vendorarch}/UDUNITS.pm
 %{perl_vendorarch}/auto/UDUNITS/UDUNITS.*
 %{perl_vendorarch}/auto/UDUNITS/autosplit.ix
@@ -119,6 +113,9 @@ find %{buildroot} \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Fri Jun 20 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.12.11-13
+- Improve arch directives
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.11-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild