[stp] Fix build failure on systems that do not define %{__isa_bits}.

Jerry James jjames at fedoraproject.org
Thu Jun 19 16:23:55 UTC 2014


commit cf5e266a7a5047467446831764a3f866b5bb5a47
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Thu Jun 19 10:23:17 2014 -0600

    Fix build failure on systems that do not define %{__isa_bits}.
    
    Also fix mixed use of spaces and tabs.  Thank you, rpmlint.

 stp.spec |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/stp.spec b/stp.spec
index e3d3433..5c401ce 100644
--- a/stp.spec
+++ b/stp.spec
@@ -1,9 +1,9 @@
 # Upstream occasionally releases a subversion snapshot, but no "regular"
 # releases since the 0.1 release.
-%global gitdate  20140619
-%global gittag   44de620db195122e812e81940c8edef947c18765
-%global shorttag %(cut -b -7 <<< %{gittag})
-%global user     stp
+%global gitdate		20140619
+%global gittag		44de620db195122e812e81940c8edef947c18765
+%global shorttag	%(cut -b -7 <<< %{gittag})
+%global user		stp
 
 Name:		stp
 Version:	0.1
@@ -26,7 +26,7 @@ BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	cryptominisat-devel
 BuildRequires:	flex
-BuildRequires:  python2
+BuildRequires:	python2
 
 %description
 STP (Simple Theorem Prover) is a constraint solver (also referred to as
@@ -75,11 +75,11 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 
 # Fix up the libdir install on 64-bit targets
-%if %{__isa_bits} == 64
-mkdir %{buildroot}%{_libdir}
-mv %{buildroot}%{_prefix}/lib/cmake %{buildroot}%{_libdir}
-mv %{buildroot}%{_prefix}/lib/libstp.so %{buildroot}%{_libdir}
-%endif
+if [ "%{_libdir}" != "%{_prefix}/lib" ]; then
+  mkdir %{buildroot}%{_libdir}
+  mv %{buildroot}%{_prefix}/lib/cmake %{buildroot}%{_libdir}
+  mv %{buildroot}%{_prefix}/lib/libstp.so %{buildroot}%{_libdir}
+fi
 
 %files
 %{_bindir}/*


More information about the scm-commits mailing list