[frama-c] Update to Oxygen version.

[Jerry James]

commit 4de86cad8377d34d3ead45c7b0195c922fe266fb
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri Oct 19 14:55:58 2012 -0600

    Update to Oxygen version.

 .gitignore               |    2 +-
 frama-c-fixes.patch      |   13 ++++++
 frama-c-ocaml4.patch     |  106 ----------------------------------------------
 frama-c-ocamlgraph.patch |   42 ------------------
 frama-c.spec             |   25 ++++-------
 sources                  |    2 +-
 6 files changed, 25 insertions(+), 165 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1ad3c7..6f885ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/frama-c-Nitrogen-20111001.tar.gz
+/frama-c-Oxygen-20120901.tar.gz
diff --git a/frama-c-fixes.patch b/frama-c-fixes.patch
new file mode 100644
index 0000000..aed54f0
--- /dev/null
+++ b/frama-c-fixes.patch
@@ -0,0 +1,13 @@
+Index: src/pdg_types/pdgTypes.ml
+===================================================================
+--- src/pdg_types/pdgTypes.ml	(révision 20081)
++++ src/pdg_types/pdgTypes.ml	(révision 20082)
+@@ -701,7 +701,7 @@
+         in (`Color color) :: attrib
+       in
+       let attrib =
+-        if Dpd.is_ctrl d then (`Arrowhead `Odot)::attrib else attrib
++        if Dpd.is_ctrl d then (`Arrowtail `Odot)::attrib else attrib
+       in
+       let attrib =
+         if Dpd.is_addr d then (`Style `Dotted)::attrib else attrib
diff --git a/frama-c.spec b/frama-c.spec
index 8fc04e9..3deb9dc 100644
--- a/frama-c.spec
+++ b/frama-c.spec
@@ -16,11 +16,11 @@
 %global ocamlbest byte
 %endif
 
-%global pkgversion Nitrogen-20111001
+%global pkgversion Oxygen-20120901
 
 Name:           frama-c
-Version:        1.7
-Release:        9%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Framework for source code analysis of C software
 
 Group:          Development/Libraries
@@ -31,11 +31,8 @@ Source0:        http://frama-c.com/download/%{name}-%{pkgversion}.tar.gz
 Source1:        frama-c-1.6.licensing
 Source2:        %{name}-gui.desktop
 Source3:        acsl.el
-# Adapt to changes in Hashtbl signature in OCaml 4.00.0.  Disable dangerous
-# code that leads to segfaults in OCaml 4.00.0.
-Patch0:         frama-c-ocaml4.patch
-# Adapt to changes in ocaml-ocamlgraph.  Submitted upstream.
-Patch1:         frama-c-ocamlgraph.patch
+# Post-release fixes from upstream
+Patch0:         %{name}-fixes.patch
 
 BuildRequires:  alt-ergo
 BuildRequires:  coq
@@ -140,19 +137,14 @@ support.
 %prep
 %setup -q -n %{name}-%pkgversion
 %patch0
-%patch1
 
 # Fix encodings
 iconv -f iso-8859-1 -t utf8 man/frama-c.1 > man/frama-c.1.conv
 touch -r man/frama-c.1 man/frama-c.1.conv
 mv -f man/frama-c.1.conv man/frama-c.1
 
-# Version 1.8 of ocamlgraph is good, therefore 1.8.X is good, too.
-# Also adapt to OCaml 4.00.0 and alt-ergo 0.94
-sed -e 's|1\.8)|1.8*)|' \
-    -e 's/3\.1\*/3.1*|4*/' \
-    -e 's/0\.92\.2/0.94/' \
-    -i configure
+# Allow use of alt-ergo 0.94
+sed -i 's/0\.92\.2/0.94/' configure
 sed -i 's/0\.92\.2/0.94/' src/wp/configure
 
 %build
@@ -255,6 +247,9 @@ xargs chmod a-x %{buildroot}%{_libdir}/frama-c/*.cmx \
 %{_xemacs_sitelispdir}/acsl.el
 
 %changelog
+* Fri Oct 19 2012 Jerry James <loganjerry at gmail.com> - 1.8-1
+- Update to Oxygen version
+
 * Tue Sep 11 2012 Jerry James <loganjerry at gmail.com> - 1.7-9
 - Disable dangerous code in src/type/type.ml that leads to segfaults.
 
diff --git a/sources b/sources
index 74ccd35..592ca6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09bf25ed3d1b54e2d523166aa4499edd  frama-c-Nitrogen-20111001.tar.gz
+f8f22501761fc67fcac5daceac82bb31  frama-c-Oxygen-20120901.tar.gz