rpms/ocaml-deriving/devel ocaml-deriving-0.1.1a-dynlink.patch, NONE, 1.1 ocaml-deriving.spec, 1.3, 1.4

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	ocaml-deriving.spec 
Added Files:
	ocaml-deriving-0.1.1a-dynlink.patch 
Log Message:
* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1.1a-6
- Patch to add dynlink.cma for camlp4lib.cma.
- Rebuild for OCaml 3.11.0.


ocaml-deriving-0.1.1a-dynlink.patch:

--- NEW FILE ocaml-deriving-0.1.1a-dynlink.patch ---
--- deriving-0.1.1.orig/syntax/Makefile	2007-06-22 00:02:10.000000000 +0100
+++ deriving-0.1.1/syntax/Makefile	2008-12-05 12:52:28.000000000 +0000
@@ -6,7 +6,7 @@
 ANNOTATE   = yes
 PPFLAGS    = -loc loc
 USE_CAMLP4 = yes
-LIBS       = camlp4lib unix
+LIBS       = dynlink camlp4lib unix
 
 CAMLP4_PRE_NOPRINTER = 
 


Index: ocaml-deriving.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-deriving/devel/ocaml-deriving.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-deriving.spec	4 Dec 2008 19:16:37 -0000	1.3
+++ ocaml-deriving.spec	5 Dec 2008 13:00:00 -0000	1.4
@@ -3,17 +3,19 @@
 
 Name:           ocaml-deriving
 Version:        0.1.1a
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Extension to OCaml for deriving functions from types
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://code.google.com/p/deriving/
 Source0:        http://deriving.googlecode.com/files/deriving-%{version}.tar.gz
-Patch0:         ocaml-deriving-no-link-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ocaml >= 3.10.0
+Patch0:         ocaml-deriving-no-link-libs.patch
+Patch1:         ocaml-deriving-0.1.1a-dynlink.patch
+
+BuildRequires:  ocaml >= 3.11.0-1
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
@@ -43,6 +45,7 @@
 %prep
 %setup -q -n deriving-0.1.1
 %patch0
+%patch1 -p1
 
 
 %build
@@ -104,6 +107,10 @@
 
 
 %changelog
+* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1.1a-6
+- Patch to add dynlink.cma for camlp4lib.cma.
+- Rebuild for OCaml 3.11.0.
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1.1a-5
 - Rebuild for OCaml 3.11.0+rc1.