[389-ds-base/f21] - Use generic 64 bit detection (fixes aarch64/ppc64le) - PPC/s390 has lm_sensors - Minor spec cleanu

[Peter Robinson]

commit 929c9fc4ef17f1a294cafb9ef32a1d1ef1acfe01
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Sep 14 09:37:11 2014 +0100

    - Use generic 64 bit detection (fixes aarch64/ppc64le)
    - PPC/s390 has lm_sensors
    - Minor spec cleanups

 389-ds-base.spec |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index cc51e0e..f323ac7 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -25,7 +25,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.3.3.3
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -55,9 +55,7 @@ BuildRequires:    pcre-devel
 BuildRequires:    gcc-c++
 # The following are needed to build the snmp ldap-agent
 BuildRequires:    net-snmp-devel
-%ifnarch sparc sparc64 ppc ppc64 s390 s390x
 BuildRequires:    lm_sensors-devel
-%endif
 BuildRequires:    bzip2-devel
 BuildRequires:    zlib-devel
 BuildRequires:    openssl-devel
@@ -181,7 +179,7 @@ NSSARGS="--with-svrcore-inc=%{_includedir} --with-svrcore-lib=%{_libdir} --with-
 # Generate symbolic info for debuggers
 export XCFLAGS=$RPM_OPT_FLAGS
 
-%ifarch x86_64 ppc64 ia64 s390x sparc64
+%if %{__isa_bits} == 64
 export USE_64=1
 %endif
 
@@ -189,8 +187,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT 
-
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname}
@@ -200,17 +196,13 @@ mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname}
 # for systemd
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{groupname}.wants
 
-#remove libtool and static libs
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
+#remove libtool archives and static libs
+find %{buildroot} -type f -name "*.la" -delete
+find %{buildroot} -type f -name "*.a" -delete
 
 # make sure perl scripts have a proper shebang 
 sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 output=/dev/null
@@ -316,6 +308,11 @@ fi
 %{_libdir}/%{pkgname}/libns-dshttpd.so*
 
 %changelog
+* Sun Sep 14 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.3.3.3-2
+- Use generic 64 bit detection (fixes aarch64/ppc64le)
+- PPC/s390 has lm_sensors
+- Minor spec cleanups
+
 * Fri Sep 12 2014 Rich Megginson <rmeggins at redhat.com> - 1.3.3.3-1
 - Release 1.3.3.3
 - Ticket #47892 - coverity defects found in 1.3.3.1