rpms/ocaml-bitstring/devel ocaml-bitstring-2.0.0-dynlink.patch, NONE, 1.1 ocaml-bitstring.spec, 1.8, 1.9

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	ocaml-bitstring.spec 
Added Files:
	ocaml-bitstring-2.0.0-dynlink.patch 
Log Message:
Patch for OCaml 3.11.0 official.

ocaml-bitstring-2.0.0-dynlink.patch:

--- NEW FILE ocaml-bitstring-2.0.0-dynlink.patch ---
--- ocaml-bitstring-2.0.0.orig/Makefile.in	2008-10-06 09:40:57.000000000 +0100
+++ ocaml-bitstring-2.0.0/Makefile.in	2008-12-05 16:19:12.000000000 +0000
@@ -109,11 +109,11 @@
 	  -I +camlp4 -pp camlp4of -c $<
 
 pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
-	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 camlp4lib.cma \
+	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
 	  -pp camlp4of -c $< -o $@
 
 bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
-	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
+	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
 	  $(OCAMLCLIBS) \
 	  bitstring.cma bitstring_persistent.cma \
 	  $< -o $@
@@ -155,7 +155,7 @@
 
 create_test_pattern: create_test_pattern.cmo
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-	  unix.cma -I +camlp4 camlp4lib.cma \
+	  unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
 	  $(OCAMLCLIBS) \
 	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
 


Index: ocaml-bitstring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bitstring/devel/ocaml-bitstring.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ocaml-bitstring.spec	4 Dec 2008 12:40:23 -0000	1.8
+++ ocaml-bitstring.spec	5 Dec 2008 16:27:50 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           ocaml-bitstring
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml library for matching and constructing bitstrings
 
 Group:          Development/Libraries
@@ -18,6 +18,9 @@
 # Fix for OCaml 3.11.0+beta1.
 Patch0:         ocaml-bitstring-2.0.0-empty-case.patch
 
+# Fix for OCaml 3.11.0 official release.
+Patch1:         ocaml-bitstring-2.0.0-dynlink.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml >= 3.10.2
@@ -87,6 +90,7 @@
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 # Keep a pristine copy of the examples directory for distribution.
 cp -a examples bitstring-examples
@@ -180,6 +184,9 @@
 
 
 %changelog
+* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-7
+- Patch for OCaml 3.11.0 official.
+
 * Thu Dec  4 2008 Richard W.M. Jones <rjones at redhat.com> - 2.0.0-6
 - Rebuild.