Rebuild for why3 0.86.1.

why-ocamlgraph186.patch

@@ -0,0 +1,14 @@
+--- src/hypotheses_filtering.ml.orig	2014-03-17 16:01:46.000000000 -0600
++++ src/hypotheses_filtering.ml	2015-03-18 12:30:00.000000000 -0600
+@@ -1686,9 +1686,9 @@
+ *******************)
+ 
+ module W = struct 
+-  type label = PdlGraph.E.label
++  type edge = PdlGraph.E.t
+   type t = int
+-  let weight x = x
++  let weight e = PdlGraph.E.label e
+   let zero = 0
+   let add = (+)
+   let compare = compare

why.spec

@@ -10,7 +10,7 @@
 
 Name:           why
 Version:        2.34
-Release:        16%{?dist}
+Release:        20%{?dist}
 Summary:        Software verification platform
 
 License:        LGPLv2 with exceptions
@@ -31,7 +31,7 @@ Source12:       patch_jessie_pvs
 Source13:       gwhy.appdata.xml
 Source14:       jessie.appdata.xml
 # Created with gimp from official upstream icon
-Source15:	%{name}-icons.tar.xz
+Source15:       %{name}-icons.tar.xz
 
 # The gwhy execution shell script is not particularly informative
 # about when bad parameters are passed to it - this patch fixes that.
@@ -54,11 +54,14 @@ Patch2:         %{name}-flocq24.patch
 # Sent upstream 26 Jun 2014.
 Patch3:         %{name}-project.patch
 
+# Adapt to ocamlgraph 1.8.6
+Patch4:         %{name}-ocamlgraph186.patch
+
 BuildRequires:  auto-destdir
 BuildRequires:  cvc3
 BuildRequires:  desktop-file-utils
 BuildRequires:  emacs xemacs xemacs-packages-extra
-BuildRequires:  frama-c-devel
+BuildRequires:  frama-c
 BuildRequires:  gappalib-coq
 BuildRequires:  gtk2-devel
 BuildRequires:  ocaml
@@ -209,6 +212,7 @@ based on Why, including various automated and interactive provers.
 %patch1
 %patch2
 %patch3
+%patch4
 
 # The other part of avoiding the "Project" module name clash
 mv src/project.ml src/whyproject.ml
@@ -217,9 +221,11 @@ mv src/project.mli src/whyproject.mli
 cp -p %SOURCE1 %SOURCE2 %SOURCE6 %SOURCE7 ./
 
 # Link with Fedora LDFLAGS
-sed -e "\%^bin/jessie\.opt%,\%^bin/jessie\.byte%s/-o/-ccopt $RPM_LD_FLAGS &/" \
-    -e "/gtkThread\.cmx/s/-o/-ccopt $RPM_LD_FLAGS &/" \
-    -i Makefile.in
+for flag in $RPM_LD_FLAGS; do
+  sed -e "\%^bin/jessie\.opt%,\%^bin/jessie\.byte%s|-o|-ccopt $flag &|" \
+      -e "/gtkThread\.cmx/s|-o|-ccopt $flag &|" \
+      -i Makefile.in
+done
 
 %define fix_encoding() \
   iconv -f %2 -t %3 %1 > %1.utf8; \
@@ -439,6 +445,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Jun 22 2015 Jerry James <loganjerry@gmail.com> - 2.34-20
+- Rebuild for why3 0.86.1
+
+* Sat May 16 2015 Jerry James <loganjerry@gmail.com> - 2.34-19
+- Rebuild for why3 0.86
+
+* Mon Apr 13 2015 Jerry James <loganjerry@gmail.com> - 2.34-18
+- Rebuild for coq 8.4pl6
+
+* Thu Mar 19 2015 Jerry James <loganjerry@gmail.com> - 2.34-17
+- Add -ocamlgraph186 patch to adapt to ocamlgraph 1.8.6
+
 * Sat Nov 15 2014 Jerry James <loganjerry@gmail.com> - 2.34-16
 - Fix gwhy-2.33.patch (bz 1164470)