SPECS: NuSMV.spec - rel 3 - fixed tetex/texlive BRs - added MiniSat and zCh...

[baggins]

Author: baggins                      Date: Wed Apr 22 11:31:14 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3
- fixed tetex/texlive BRs
- added MiniSat and zChaff solvers
- properly build cudd

---- Files affected:
SPECS:
   NuSMV.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/NuSMV.spec
diff -u SPECS/NuSMV.spec:1.10 SPECS/NuSMV.spec:1.11
--- SPECS/NuSMV.spec:1.10	Thu Mar  5 23:30:30 2009
+++ SPECS/NuSMV.spec	Wed Apr 22 13:31:09 2009
@@ -1,18 +1,26 @@
 # $Revision$, $Date$
 #
-# TODO:
-#	- external cudd
+# Conditional build:
+%bcond_with	zchaff	# enable zChaff SAT Solver (zChaff is for non-commercial purposes only)
+#
+%define	zchaff_ver	2008.10.12
+%define minisat_ver	070721
 #
 Summary:	New Symbolic Model Verifier
 Summary(pl.UTF-8):	Nowy weryfikator modeli symbolicznych
 Name:		NuSMV
 Version:	2.4.3
-Release:	2
+Release:	3
 License:	LGPL
 Group:		Applications
 Source0:	http://nusmv.irst.itc.it/distrib/%{name}-%{version}.tar.gz
 # Source0-md5:	f9fb88139b388c6ba8d31b0ad1ce5254
+Source1:	http://minisat.se/downloads/minisat2-%{minisat_ver}.zip
+# Source1-md5:	fb12db9a13f86a2133758abfba239546
+Source2:	http://www.princeton.edu/~chaff/zchaff/zchaff.%{zchaff_ver}.zip
+# Source2-md5:	7398b3e984a5046755cb3ef6b0e44d2e
 Patch0:		%{name}-build.patch
+Patch1:		%{name}-solvers.patch
 URL:		http://nusmv.irst.itc.it/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -23,12 +31,13 @@
 #BuildRequires:	links
 BuildRequires:	perl-base
 BuildRequires:	readline-devel
-BuildRequires:	tetex-dvips
-BuildRequires:	tetex-format-latex
-BuildRequires:	tetex-latex-bibtex
-BuildRequires:	tetex-latex-carlisle
-BuildRequires:	tetex-latex-psnfss
-BuildRequires:	tetex-makeindex
+BuildRequires:	texlive-dvips
+BuildRequires:	texlive-latex
+BuildRequires:	texlive-latex-bibtex
+BuildRequires:	texlive-latex-carlisle
+BuildRequires:	texlive-latex-extend
+BuildRequires:	texlive-latex-psnfss
+BuildRequires:	texlive-makeindex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -87,26 +96,42 @@
 %setup -q
 %patch0 -p1
 
+install %{SOURCE1} MiniSat/
+install %{SOURCE2} zchaff/
+
+%patch1 -p1
+
 %build
 ICFLAGS="%{rpmcflags}"
 export ICFLAGS
 
+cd MiniSat/
+OPTFLAGS="%{rpmcxxflags}" ./build.sh
+%if %{with zchaff}
+cd ../zchaff
+OPTFLAGS="%{rpmcxxflags}" ./build.sh
+%endif
+cd ../cudd-*
 %ifarch %{x8664}
-cd cudd-*
 cp -f Makefile Makefile_32bit
 cp -f Makefile_64bit Makefile
-cd ..
 %endif
+%{__make}
+cd ..
 
 cd nusmv
 
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	--enable-shared \
-	--enable-psl
+	--enable-psl \
+	%{?with_zchaff:--enable-zchaff} \
+	--enable-minisat
+
 %{__make}
 %{__make} docs
 
@@ -119,6 +144,8 @@
 
 cp -a nusmv/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/nusmv/{doc,examples,LGPL*,NEWS,README*}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -132,6 +159,7 @@
 %doc nusmv/doc/user-man/nusmv.p*
 %doc nusmv/doc/html
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %ghost %{_libdir}/libnusmv*.so.0
 %attr(755,root,root) %{_libdir}/libnusmv*.so.*.*.*
 %dir %{_datadir}/nusmv
 %{_datadir}/nusmv/contrib
@@ -157,6 +185,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/04/22 11:31:09  baggins
+- rel 3
+- fixed tetex/texlive BRs
+- added MiniSat and zChaff solvers
+- properly build cudd
+
 Revision 1.10  2009/03/05 22:30:30  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/NuSMV.spec?r1=1.10&r2=1.11&f=u