rpms/ocaml-bitstring/devel ocaml-bitstring-2.0.0-empty-case.patch, NONE, 1.1 ocaml-bitstring.spec, 1.6, 1.7

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-bitstring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2452

Modified Files:
	ocaml-bitstring.spec 
Added Files:
	ocaml-bitstring-2.0.0-empty-case.patch 
Log Message:
* Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-5
- Disable CIL tools.
- Patch for OCaml 3.11.0.

* Wed Nov 19 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-3
- Rebuild for OCaml 3.11.0


ocaml-bitstring-2.0.0-empty-case.patch:

--- NEW FILE ocaml-bitstring-2.0.0-empty-case.patch ---
--- ocaml-bitstring-2.0.0.orig/pa_bitstring.ml	2008-10-17 09:53:25.000000000 +0100
+++ ocaml-bitstring-2.0.0/pa_bitstring.ml	2008-11-20 18:10:27.000000000 +0000
@@ -1123,6 +1123,10 @@
       fields = LIST0 patt_field SEP ";";
       "}" ->
 	List.concat fields
+    | "{";
+      "_";
+      "}" ->
+	[]
     ]
   ];
 


Index: ocaml-bitstring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/ocaml-bitstring.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-bitstring.spec	21 Oct 2008 09:48:24 -0000	1.6
+++ ocaml-bitstring.spec	20 Nov 2008 18:19:25 -0000	1.7
@@ -1,23 +1,23 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
-# Don't have CIL on ppc & ppc64 so we cannot build the C tools.
-# See: bz#435546 bz#435545
-%ifarch ppc ppc64
+# CIL tools are deprecated, don't build them on any platform.
 %define build_cil_tools 0
-%else
-%define build_cil_tools 1
-%endif
 
 Name:           ocaml-bitstring
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        OCaml library for matching and constructing bitstrings
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions and GPLv2+
+
 URL:            http://code.google.com/p/bitstring/
 Source0:        http://bitstring.googlecode.com/files/%{name}-%{version}.tar.gz
+
+# Fix for OCaml 3.11.0+beta1.
+Patch0:         ocaml-bitstring-2.0.0-empty-case.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml >= 3.10.2
@@ -86,6 +86,8 @@
 %prep
 %setup -q
 
+%patch0 -p1
+
 # Keep a pristine copy of the examples directory for distribution.
 cp -a examples bitstring-examples
 
@@ -178,6 +180,13 @@
 
 
 %changelog
+* Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-5
+- Disable CIL tools.
+- Patch for OCaml 3.11.0.
+
+* Wed Nov 19 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-3
+- Rebuild for OCaml 3.11.0
+
 * Tue Oct 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-2
 - Fixed incorrect sources file.