- New upstream version 1.3.7.

- Rebuild for OCaml 3.11.1.

.cvsignore

@@ -1 +1 @@
-cil-1.3.6.tar.gz
+cil-1.3.7.tar.gz

cil-1.3.7-output-obj.patch

@@ -1,13 +1,14 @@
---- cil.orig/Makefile.in	2007-02-05 21:10:29.000000000 +0000
-+++ cil/Makefile.in	2008-12-05 17:03:59.000000000 +0000
-@@ -273,7 +273,9 @@
+diff -ur cil-1.3.7.orig/Makefile.in cil-1.3.7/Makefile.in
+--- cil-1.3.7.orig/Makefile.in	2009-04-24 19:50:33.000000000 +0100
++++ cil-1.3.7/Makefile.in	2009-05-26 15:46:02.932947721 +0100
+@@ -287,7 +287,9 @@
  ifeq ($(NATIVECAML),1)
- $(OBJDIR)/libcil.a: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
+ $(OBJDIR)/libcil.o: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
                      $(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO))
 -	ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^
 +	ocamlopt -output-obj -o tmpcil.o $(CILLY_LIBS:%=%.cmxa) $^
 +	ar rcs $@ tmpcil.o
 +	rm -f tmpcil.o
  else
- $(OBJDIR)/libcil.a:
+ $(OBJDIR)/libcil.o:
  	@echo "Can only build $@ when NATIVECAML is 1."

ocaml-cil.spec

@@ -5,21 +5,21 @@
 %define __strip /bin/true
 
 Name:           ocaml-cil
-Version:        1.3.6
-Release:        11%{?dist}
+Version:        1.3.7
+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-1.3.6.tar.gz
+Source0:        http://hal.cs.berkeley.edu/cil/distrib/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.6-output-obj.patch
+Patch0:         cil-1.3.7-output-obj.patch
 
 BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
 
@@ -90,7 +90,7 @@ for gcc.
 
 
 %prep
-%setup -q -n cil
+%setup -q -n cil-%{version}
 %patch0 -p1
 ./configure --libdir=%{_libdir}
 
@@ -117,7 +117,7 @@ cat > bin/CilConfig.pm <<EOF
 \$::default_mode = "GNUCC";
 EOF
 
-strip obj/$archos/libcil.a
+strip obj/$archos/libcil.o
 #strip obj/$archos/cilly.byte.exe - NO! It removes the bytecode :-(
 %if %opt
 strip obj/$archos/cilly.asm.exe
@@ -195,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 26 2009 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-1
+- New upstream version 1.3.7.
+- Rebuild for OCaml 3.11.1.
+
 * Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
 - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
   (added sparc64 per request from the sparc maintainer)

sources

@@ -1 +1 @@
-112dfbabdd0e1280800d62ba4449ab45  cil-1.3.6.tar.gz
+e0e3ce3b04c0d9cccf98381feb6d89de  cil-1.3.7.tar.gz