rpms
/
stp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Also fix mixed use of spaces and tabs.  Thank you, rpmlint.
This commit is contained in:
Jerry James 2014-06-19 10:23:17 -06:00
parent 31e34f55e7
commit cf5e266a7a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stp.spec
View File

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