rpms/ocaml-mikmatch/devel ocaml-mikmatch-1.0.0-dynlink.patch, NONE, 1.1 ocaml-mikmatch.spec, 1.3, 1.4

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	ocaml-mikmatch.spec 
Added Files:
	ocaml-mikmatch-1.0.0-dynlink.patch 
Log Message:
* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-4
- Patch for dynlink.cma dependency for camlp4.
- Rebuild for OCaml 3.11.0.


ocaml-mikmatch-1.0.0-dynlink.patch:

--- NEW FILE ocaml-mikmatch-1.0.0-dynlink.patch ---
--- mikmatch-1.0.0.orig/pcre/Makefile	2008-07-26 22:00:25.000000000 +0100
+++ mikmatch-1.0.0/pcre/Makefile	2008-12-05 12:34:04.000000000 +0000
@@ -96,7 +96,7 @@
 		mikmatch.ml run_mikmatch_pcre.ml
 	ocamlmktop -o mikmatch_pcre.top \
 		-I +camlp4 -I $(PCRE_DIR) \
-		camlp4o.cma \
+		dynlink.cma camlp4o.cma \
 		pa_mikmatch_pcre.cma pcre.cma unix.cma run_mikmatch_pcre.cma
 
 misc-nc:
@@ -112,7 +112,7 @@
 simple-test:
 	camlp4o ./pa_mikmatch_pcre.cma -printer o test.ml > test.ppo
 	ocamlmktop -o mikmatch_pcre.test -I +camlp4 -I .  -I $(PCRE_DIR) \
-		camlp4o.cma \
+		dynlink.cma camlp4o.cma \
 		pa_mikmatch_pcre.cma pcre.cma unix.cma run_mikmatch_pcre.cma
 
 # Preinstall test


Index: ocaml-mikmatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/ocaml-mikmatch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-mikmatch.spec	4 Dec 2008 19:26:46 -0000	1.3
+++ ocaml-mikmatch.spec	5 Dec 2008 12:41:24 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mikmatch
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OCaml extension for pattern matching with regexps
 
 Group:          Development/Libraries
@@ -12,7 +12,9 @@
 Source0:        http://martin.jambon.free.fr/mikmatch-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ocaml >= 3.10.0
+Patch0:         ocaml-mikmatch-1.0.0-dynlink.patch
+
+BuildRequires:  ocaml >= 3.11.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
@@ -51,6 +53,7 @@
 
 %prep
 %setup -q -n mikmatch-%{version}
+%patch0 -p1
 
 
 %build
@@ -105,6 +108,10 @@
 
 
 %changelog
+* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-4
+- Patch for dynlink.cma dependency for camlp4.
+- Rebuild for OCaml 3.11.0.
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-3
 - Rebuild for OCaml 3.11.0+rc1.