-diff -ur NuSMV-2.4.3/MiniSat/minisat-default.in NuSMV-2.4.3.solvers/MiniSat/minisat-default.in
---- NuSMV-2.4.3/MiniSat/minisat-default.in 2007-03-16 15:32:59.000000000 +0100
-+++ NuSMV-2.4.3.solvers/MiniSat/minisat-default.in 2009-04-22 12:57:50.000000000 +0200
-@@ -13,12 +13,13 @@
- #minisat_zip=MiniSat_v${minisat_ver}_src.zip
- #minisat_dir=MiniSat_v${minisat_ver}
-
--minisat_ver=061208
-+minisat_ver=070721
- minisat_zip=minisat2-${minisat_ver}.zip
- minisat_dir=minisat
-
- # ----------------------------------------------------------------------
--minisat_patch=MiniSat_v${minisat_ver}_nusmv.patch
-+#minisat_patch=MiniSat_v${minisat_ver}_nusmv.patch
-+minisat_patch=MiniSat_v061208_nusmv.patch
- minisat_link=MiniSat_v${minisat_ver}
- minisat_libname=MiniSat
- minisat_ifcname=Solver_C.h
-diff -ur NuSMV-2.4.3/MiniSat/MiniSat_v061208_nusmv.patch NuSMV-2.4.3.solvers/MiniSat/MiniSat_v061208_nusmv.patch
---- NuSMV-2.4.3/MiniSat/MiniSat_v061208_nusmv.patch 2007-03-27 18:13:30.000000000 +0200
-+++ NuSMV-2.4.3.solvers/MiniSat/MiniSat_v061208_nusmv.patch 2009-04-22 13:02:51.000000000 +0200
-@@ -270,11 +270,27 @@
+diff -ur NuSMV-2.4.3/MiniSat/MiniSat_v070721_nusmv.patch NuSMV-2.4.3.solvers/MiniSat/MiniSat_v070721_nusmv.patch
+--- NuSMV-2.4.3/MiniSat/MiniSat_v070721_nusmv.patch 2007-03-27 18:13:30.000000000 +0200
++++ NuSMV-2.4.3.solvers/MiniSat/MiniSat_v070721_nusmv.patch 2009-04-22 13:02:51.000000000 +0200
+@@ -447,11 +447,23 @@
## Clean rule
clean:
+ LFLAGS = -lz
+
+ include ../mtl/template.mk
- diff -Naur minisat_ORIG/simp/Makefile minisat/simp/Makefile
- --- minisat_ORIG/simp/Makefile 2006-10-02 14:09:42.000000000 +0200
- +++ minisat/simp/Makefile 2007-03-27 17:49:56.000000000 +0200
--@@ -5,7 +5,8 @@
+ diff -Naur minisat.ORIG/simp/Makefile minisat/simp/Makefile
+ --- minisat.ORIG/simp/Makefile 2006-10-02 14:09:42.000000000 +0200
+ +++ minisat/simp/Makefile 2010-01-27 12:44:25.000000000 +0100
+ @@ -5,7 +5,8 @@
- CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store
-+@@ -5,10 +5,11 @@
-+ CORE = ../core
-+ CHDRS = $(wildcard *.h) $(wildcard $(MTL)/*.h)
-+ EXEC = minisat
-+-CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store
-++CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(OPTFLAGS)
++ CFLAGS = -I$(MTL) -I$(CORE) -Wall -ffloat-store $(OPTFLAGS)
LFLAGS = -lz
-CSRCS = $(wildcard *.C)
+++ NuSMV-2.4.3.solvers/zchaff/zchaff.64bit.2007.3.12_nusmv.patch 2009-04-22 12:59:23.000000000 +0200
@@ -1,11 +1,11 @@
-diff -Naur zchaff64_ORIG/Makefile zchaff64/Makefile
----- zchaff64_ORIG/Makefile 2007-03-14 03:48:02.000000000 +0100
--+++ zchaff64/Makefile 2007-03-16 14:46:24.000000000 +0100
+---- zchaff64_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200
+-+++ zchaff64/Makefile 2009-05-06 13:19:21.000000000 +0200
+diff -Naur zchaff_ORIG/Makefile zchaff/Makefile
-+--- zchaff_ORIG/Makefile 2007-03-14 03:48:02.000000000 +0100
-++++ zchaff/Makefile 2007-03-16 14:46:24.000000000 +0100
++--- zchaff_ORIG/Makefile 2009-05-06 13:17:49.000000000 +0200
+++++ zchaff/Makefile 2009-05-06 13:19:21.000000000 +0200
@@ -1,5 +1,6 @@
CC = g++ -Wall
-CFLAGS = -O3
clean:
rm -f *.o libsat.a zchaff *wrapper.cpp zminimal zverify_df cnf_stats SAT_C.h
+-diff -Naur zchaff64_ORIG/zchaff_dbase.cpp zchaff64/zchaff_dbase.cpp
+---- zchaff64_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200
+-+++ zchaff64/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200
++diff -Naur zchaff_ORIG/zchaff_dbase.cpp zchaff/zchaff_dbase.cpp
++--- zchaff_ORIG/zchaff_dbase.cpp 2009-05-06 13:17:49.000000000 +0200
+++++ zchaff/zchaff_dbase.cpp 2009-05-06 13:21:39.000000000 +0200
+ @@ -33,6 +33,7 @@
+ // of the possibility of those damages.
+ // ********************************************************************/
+@@ -47,9 +47,9 @@
+ #include <iostream>
+ #include <vector>
+ #include <set>
-diff -Naur zchaff64_ORIG/zchaff_utils.cpp zchaff64/zchaff_utils.cpp
----- zchaff64_ORIG/zchaff_utils.cpp 2007-03-14 03:48:02.000000000 +0100
--+++ zchaff64/zchaff_utils.cpp 2007-03-16 14:48:56.000000000 +0100
+---- zchaff64_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200
+-+++ zchaff64/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200
+diff -Naur zchaff_ORIG/zchaff_utils.cpp zchaff/zchaff_utils.cpp
-+--- zchaff_ORIG/zchaff_utils.cpp 2007-03-14 03:48:02.000000000 +0100
-++++ zchaff/zchaff_utils.cpp 2007-03-16 14:48:56.000000000 +0100
++--- zchaff_ORIG/zchaff_utils.cpp 2009-05-06 13:17:49.000000000 +0200
+++++ zchaff/zchaff_utils.cpp 2009-05-06 13:19:21.000000000 +0200
@@ -38,7 +38,9 @@
#include <stdlib.h>
#include <unistd.h>
diff -ur NuSMV-2.4.3/zchaff/zchaff-default.in NuSMV-2.4.3.solvers/zchaff/zchaff-default.in
--- NuSMV-2.4.3/zchaff/zchaff-default.in 2007-03-16 15:33:00.000000000 +0100
+++ NuSMV-2.4.3.solvers/zchaff/zchaff-default.in 2009-04-22 12:58:24.000000000 +0200
-@@ -9,16 +9,17 @@
+@@ -9,17 +9,18 @@
# ----------------------------------------------------------------------
# this is for the older version
-zchaff_ver=2007.3.12
-zchaff_zip=zchaff.64bit.$zchaff_ver.zip
+-zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}"
-zchaff_dir=zchaff64
+#zchaff_ver=2007.3.12
+#zchaff_zip=zchaff.64bit.$zchaff_ver.zip
++#zchaff_url="http://www.princeton.edu/~chaff/zchaff/${zchaff_zip}"
+#zchaff_dir=zchaff64
# ----------------------------------------------------------------------
-zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch
+#zchaff_patch=zchaff.64bit.${zchaff_ver}_nusmv.patch
+zchaff_patch=zchaff.64bit.2007.3.12_nusmv.patch
- zchaff_link=../zchaff_v${zchaff_ver}
+ zchaff_link=zchaff_v${zchaff_ver}
zchaff_libname=sat
zchaff_ifcname=SAT_C.h
Summary: New Symbolic Model Verifier
Summary(pl.UTF-8): Nowy weryfikator modeli symbolicznych
Name: NuSMV
-Version: 2.4.3
-Release: 3
+Version: 2.5.0
+Release: 1
License: LGPL
Group: Applications
Source0: http://nusmv.irst.itc.it/distrib/%{name}-%{version}.tar.gz
-# Source0-md5: f9fb88139b388c6ba8d31b0ad1ce5254
+# Source0-md5: 904c06c57d3882bc5a10f09ca0ba9a06
Source1: http://minisat.se/downloads/minisat2-%{minisat_ver}.zip
# Source1-md5: fb12db9a13f86a2133758abfba239546
Source2: http://www.princeton.edu/~chaff/zchaff/zchaff.%{zchaff_ver}.zip
cd nusmv
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
+/bin/bash %configure \
--enable-shared \
--enable-psl \
%{?with_zchaff:--enable-zchaff} \
--enable-minisat
%{__make}
-%{__make} docs
+%{__make} docs \
+ SHELL=/bin/bash
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} -j1 -C nusmv install \
+ SHELL=/bin/bash \
DESTDIR=$RPM_BUILD_ROOT
cp -a nusmv/examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib*smv*.so.0
+%attr(755,root,root) %{_libdir}/lib*smv*.so.*.*.*
%dir %{_datadir}/nusmv
%{_datadir}/nusmv/contrib
%{_datadir}/nusmv/help
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnusmv*.so
-%{_libdir}/libnusmv*.la
+%attr(755,root,root) %{_libdir}/lib*smv*.so
+%{_libdir}/lib*smv*.la
%{_includedir}/cudd*
%{_includedir}/nusmv
%{_pkgconfigdir}/*
%files static
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnusmv*.a
+%attr(755,root,root) %{_libdir}/lib*smv*.a