[why] New upstream version. Drop upstreamed patches.

[Jerry James]

commit 06edd92de33ee2ff00dac096648f8206443cc1cf
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Jul 30 20:55:08 2012 -0600

    New upstream version.
    Drop upstreamed patches.

 .gitignore                                         |    2 +-
 gwhy-2.26.patch => gwhy-2.31.patch                 |    0
 sources                                            |    4 +-
 ...Makefile.in.patch => why-2.31-Makefile.in.patch |   12 +-
 why-apron.patch                                    |   40 --
 why-flocq2.patch                                   |  510 --------------------
 why.spec                                           |   28 +-
 7 files changed, 21 insertions(+), 575 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3c891f7..719a194 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /krakatoa.pdf
-/why-2.30.tar.gz
+/why-2.31.tar.gz
diff --git a/gwhy-2.26.patch b/gwhy-2.31.patch
similarity index 100%
rename from gwhy-2.26.patch
rename to gwhy-2.31.patch
diff --git a/sources b/sources
index ae20770..c472a51 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1e8d6c76e5c3cee018172e981309c68b  krakatoa.pdf
-c3f6c5616e32743e883ffb7609f96336  why-2.30.tar.gz
+08f92283da47fdb190f516339472e575  krakatoa.pdf
+d647f64049345be5654f8f3fdb077aa4  why-2.31.tar.gz
diff --git a/why-2.30-Makefile.in.patch b/why-2.31-Makefile.in.patch
similarity index 66%
rename from why-2.30-Makefile.in.patch
rename to why-2.31-Makefile.in.patch
index eb43de5..9546b4b 100644
--- a/why-2.30-Makefile.in.patch
+++ b/why-2.31-Makefile.in.patch
@@ -1,7 +1,7 @@
---- Makefile.in.orig	2011-10-24 09:21:06.000000000 -0600
-+++ Makefile.in	2011-10-25 15:37:54.600278865 -0600
-@@ -782,14 +782,9 @@
- 	cp -f $(V7FILES) $(LIBDIR)/why/coq7
+--- Makefile.in.orig	2012-07-19 12:33:10.000000000 -0600
++++ Makefile.in	2012-07-30 20:28:33.062463838 -0600
+@@ -812,14 +812,9 @@
+ 	mkdir -p $(LIBDIR)/why/coq7
  	cp -f $(VO7) $(LIBDIR)/why/coq7
  install-coq-v8 install-coq-v8.1:
 -	if test -w $(COQLIB) ; then \
@@ -9,9 +9,9 @@
 -	  cp -f $(VO8) $(COQLIB)/user-contrib/Why ; \
 -	else \
 -	  echo "Cannot copy to Coq standard library. Add \"-R $(LIBDIR)/why/coq Why\" to Coq options." ;\
--	mkdir -p $(LIBDIR)/why/coq ;\
--	cp -f $(VO8) $(V8FILES) $(LIBDIR)/why/coq ;\
 -	fi
+-	mkdir -p $(LIBDIR)/why/coq
+-	cp -f $(VO8) $(LIBDIR)/why/coq
 +	mkdir -p $(COQLIB)/user-contrib/Why
 +	cp -f $(V8FILES) $(COQLIB)/user-contrib/Why
 +	cp -f $(VO8) $(COQLIB)/user-contrib/Why
diff --git a/why.spec b/why.spec
index 72a5e3a..95d490f 100644
--- a/why.spec
+++ b/why.spec
@@ -19,8 +19,8 @@
 %global debug_package %{nil}
 
 Name:           why
-Version:        2.30
-Release:        7%{?dist}
+Version:        2.31
+Release:        1%{?dist}
 Summary:        Software verification platform
 
 Group:          Applications/Engineering
@@ -44,7 +44,7 @@ Source12:       patch_jessie_pvs
 # about when bad parameters are passed to it - this patch fixes that.
 # Upstream has been informed about this issue and a better fix is on
 # their todo list
-Patch0:         gwhy-2.26.patch
+Patch0:         gwhy-2.31.patch
 
 # This patch makes a Fedora-specific fix to eliminate checking for the
 # location of Coq - since we're using the coq package, we know where
@@ -52,14 +52,7 @@ Patch0:         gwhy-2.26.patch
 # It also makes a fix necessary to correctly build the bytecode only
 # version of why by building the make_float_model tool correctly in
 # this case.
-Patch1:         why-2.30-Makefile.in.patch
-
-# This patch fixes some mildly bitrotted APRON support code.
-# Applied upstream.
-Patch2:         why-apron.patch
-
-# This patch updates the flocq usage for flocq 2.0.0.  It will be sent upstream.
-Patch3:         why-flocq2.patch
+Patch1:         why-2.31-Makefile.in.patch
 
 BuildRequires:  auto-destdir
 BuildRequires:  cvc3
@@ -218,8 +211,6 @@ based on Why, including various automated and interactive provers.
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
 
 cp -p %SOURCE1 %SOURCE2 %SOURCE6 %SOURCE7 ./
 
@@ -271,10 +262,11 @@ sed -e "s|-I +apron|-I +apron -I +mlgmpidl|" \
 
 # Update the version numbers of external programs
 # Also, command "pvs" is LVM2's /sbin/pvs, so rename "pvs" to pvs-sbcl:
-sed -e 's/versions_ok = \["0\.93"\]/versions_ok = ["0.93";"0.94"]/' \
-    -e 's/versions_ok = \["1\.0\.25";.*\]/versions_ok = ["1.0.31"]/' \
+sed -e 's/\(versions_ok = \["0\.13\.0";"0\.14\.0";"0\.15\.1"\)\];/\1;"0.16.0";"0.16.1"];' \
+    -e 's/versions_ok = \["0\.93"\]/versions_ok = ["0.93";"0.94"]/' \
+    -e 's/versions_ok = \["1\.0\.25";.*\]/versions_ok = ["1.0.35"]/' \
     -e 's/versions_ok = \["2.2"\]/versions_ok = ["2.4.1"]/' \
-    -e 's/versions_ok = \["8\.0";.*\]/versions_ok = ["8.3pl2"]/' \
+    -e 's/versions_ok = \["8\.0";.*\]/versions_ok = ["8.3pl4"]/' \
     -e 's/versions_ok = \["4\.1"\]/versions_ok = ["5.0"]/' \
     -e 's/command = "pvs"/command = "pvs-sbcl"/' \
     -e 's/PVS, (pvs, \["pvs"\]);/PVS, (pvs, ["pvs-sbcl" ; "pvs"]);/' \
@@ -438,6 +430,10 @@ diff -u min.why min_why.why.result  # Show differences from correct result.
 
 
 %changelog
+* Mon Jul 30 2012 Jerry James <loganjerry at gmail.com> - 2.31-1
+- New upstream version
+- Drop upstreamed patches
+
 * Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 2.30-7
 - Rebuild for OCaml 4.00.0 official.