[ocaml-cil] New upstream version 1.4.0.

[Richard W.M. Jones]

commit bbea72a876cafbd455b8c3507d39f295eabe3466
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jan 6 18:37:59 2012 +0000

    New upstream version 1.4.0.
    
    - Rebuild for OCaml 3.12.1.

 .gitignore                      |    1 +
 cil-1.3.7-no-link-to-clib.patch |   10 ----------
 cil-1.3.7-output-obj.patch      |   14 --------------
 ocaml-cil.spec                  |   32 +++++++++++---------------------
 sources                         |    2 +-
 5 files changed, 13 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f44fe98..cebc176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cil-1.3.7.tar.gz
+/cil-1.4.0.tar.gz
diff --git a/ocaml-cil.spec b/ocaml-cil.spec
index 0df7b5c..40ea96d 100644
--- a/ocaml-cil.spec
+++ b/ocaml-cil.spec
@@ -5,23 +5,20 @@
 %define __strip /bin/true
 
 Name:           ocaml-cil
-Version:        1.3.7
-Release:        10%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://cil.sourceforge.net/
-Source0:        http://hal.cs.berkeley.edu/cil/distrib/cil-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/cil/cil-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 ExcludeArch:    ppc
 ExcludeArch:    sparc64
 ExcludeArch:    s390 s390x
 
-Patch0:         cil-1.3.7-output-obj.patch
-Patch1:         cil-1.3.7-no-link-to-clib.patch
-
 BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
 
 %define _use_internal_dependency_generator 0
@@ -92,8 +89,6 @@ for gcc.
 
 %prep
 %setup -q -n cil-%{version}
-%patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -101,14 +96,6 @@ for gcc.
 make RELEASE=1
 make quicktest
 
-cat > META <<EOF
-version="%{version}"
-description="%{summary}"
-archive(byte)="cil.cma"
-archive(native)="cil.cmxa"
-requires=""
-EOF
-
 archos=`ls obj`
 
 rm -f bin/CilConfig.pm
@@ -119,7 +106,6 @@ cat > bin/CilConfig.pm <<EOF
 \$::default_mode = "GNUCC";
 EOF
 
-strip obj/$archos/libcil.o
 #strip obj/$archos/cilly.byte.exe - NO! It removes the bytecode :-(
 %if %opt
 strip obj/$archos/cilly.asm.exe
@@ -157,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README.md LICENSE
 %{_libdir}/ocaml/cil
 %if %opt
 %exclude %{_libdir}/ocaml/cil/*.a
@@ -170,7 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README.md LICENSE
 %if %opt
 %{_libdir}/ocaml/cil/*.a
 %{_libdir}/ocaml/cil/*.cmxa
@@ -182,11 +168,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%doc README LICENSE doc/*
+%doc README.md LICENSE doc/*
 
 %files cilly
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README.md LICENSE
 %{perl_vendorlib}/CilConfig.pm
 %{perl_vendorlib}/Cilly.pm
 %{perl_vendorlib}/KeptFile.pm
@@ -198,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan  6 2012 Richard W.M. Jones <rjones at redhat.com> - 1.4.0-1
+- New upstream version 1.4.0.
+- Rebuild for OCaml 3.12.1.
+
 * Mon Jun 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.3.7-10
 - Perl mass rebuild
 
diff --git a/sources b/sources
index 95ff321..a9ac816 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0e3ce3b04c0d9cccf98381feb6d89de  cil-1.3.7.tar.gz
+a61b329f66e7646163ada56046545af5  cil-1.4.0.tar.gz