Author: baggins Date: Wed Apr 6 19:10:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed build and install
- eliminated bashizms
---- Files affected:
packages/NuSMV:
NuSMV.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/NuSMV/NuSMV.spec
diff -u packages/NuSMV/NuSMV.spec:1.16 packages/NuSMV/NuSMV.spec:1.17
--- packages/NuSMV/NuSMV.spec:1.16 Wed Apr 6 10:44:17 2011
+++ packages/NuSMV/NuSMV.spec Wed Apr 6 21:09:57 2011
@@ -41,6 +41,9 @@
BuildRequires: unzip
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# a lot of inter-library deps confusing install_post_check_so
+%define no_install_post_check_so 1
+
%description
NuSMV is a reimplementation and extension of SMV, the first model
checker based on BDDs. NuSMV has been designed to be an open
@@ -103,14 +106,14 @@
%patch1 -p1
%build
-ICFLAGS="%{rpmcflags}"
+ICFLAGS="%{rpmcflags} -fPIC"
export ICFLAGS
cd MiniSat/
-OPTFLAGS="%{rpmcxxflags}" ./build.sh
+OPTFLAGS="%{rpmcxxflags} -fPIC" COPTIMIZE="%{rpmcxxflags} -fPIC" ./build.sh
%if %{with zchaff}
cd ../zchaff
-OPTFLAGS="%{rpmcxxflags}" ./build.sh
+OPTFLAGS="%{rpmcxxflags} -fPIC" ./build.sh
%endif
cd ../cudd-*
%ifarch %{x8664}
@@ -122,27 +125,32 @@
cd nusmv
-/bin/bash %configure \
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+%configure \
--enable-shared \
- --enable-psl \
%{?with_zchaff:--enable-zchaff} \
--enable-minisat
%{__make}
-%{__make} docs \
- SHELL=/bin/bash
+
+%{__make} docs
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} -j1 -C nusmv install \
- SHELL=/bin/bash \
+ INSTALL_DATA="cp -a" \
+ INSTALL_HEADER="install -p" \
DESTDIR=$RPM_BUILD_ROOT
cp -a nusmv/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-rm -r $RPM_BUILD_ROOT%{_datadir}/nusmv/{doc,examples,LGPL*,NEWS,README*}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/nusmv/{doc,examples,LGPL*,NEWS,README*}
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -182,6 +190,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2011/04/06 19:09:57 baggins
+- fixed build and install
+- eliminated bashizms
+
Revision 1.16 2011/04/06 08:44:17 baggins
- drop libtool file
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NuSMV/NuSMV.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
