[jpilot-backup] Remove aarch64 patch (handled in %%configure macro), Generalise 64 bit arch detection, Cleanup spec

[Peter Robinson]

commit 7ecca67649a1608ebb8d353d159d2013e911ff49
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jun 25 12:22:55 2014 +0100

    Remove aarch64 patch (handled in %%configure macro), Generalise 64 bit arch detection, Cleanup spec

 jpilot-backup-aarch64.patch | 1641 -------------------------------------------
 jpilot-backup.spec          |   21 +-
 2 files changed, 9 insertions(+), 1653 deletions(-)
---
diff --git a/jpilot-backup.spec b/jpilot-backup.spec
index 34ead8d..76c20fe 100644
--- a/jpilot-backup.spec
+++ b/jpilot-backup.spec
@@ -1,18 +1,16 @@
 Summary: Enhanced backup plugin for J-Pilot
 Name: jpilot-backup
 Version: 0.60
-Release: 14%{dist}
+Release: 15%{dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.jlogday.com/code/jpilot-backup/%{name}-%{version}.tar.gz
 Patch0: jpilot-backup-libdir.patch
-Patch1: jpilot-backup-aarch64.patch
 URL: http://www.jlogday.com/code/jpilot-backup/
 Requires: jpilot >= 0.99.2
 BuildRequires: pilot-link-devel
 BuildRequires: gtk2-devel
 BuildRequires: gdbm-devel
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # pilot-link excludes s390 and s390s, as such I must also exclude those arches
 ExcludeArch: s390 s390x
@@ -24,10 +22,9 @@ and the ability to specify which databases to backup.
 %prep
 %setup -n %{name}-%{version} -q
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .aarch64
 
 %build
-%ifarch x86_64 ppc64 s390x
+%if %{__isa_bits} == 64
 %configure --libdir=/lib64/jpilot/plugins
 %else
 %configure --libdir=/lib/jpilot/plugins
@@ -36,22 +33,22 @@ and the ability to specify which databases to backup.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make prefix=$RPM_BUILD_ROOT%{_prefix} install
 
-# manually remove the static library
-# as --disable-static flag to ./configure does not help
-rm  $RPM_BUILD_ROOT%{_libdir}/jpilot/plugins/libbackup.la
+# manually remove the libtool archive
+find %{buildroot} -type f -name "*.la" -delete
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc README README.NFS ChangeLog COPYING CREDITS TODO
 %{_libdir}/jpilot/plugins/libbackup.so
 
 %changelog
+* Wed Jun 25 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.60-15
+- Remove aarch64 patch (handled in %%configure macro)
+- Generalise 64 bit arch detection
+- Cleanup spec
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild