packages: ocaml-pg/ocaml-pg.spec, ocaml-pg/ocaml-pg-calendar.patch (NEW) - ...

[baggins]

Author: baggins                      Date: Mon Jul 18 11:50:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8
- fix building with latest calendar

---- Files affected:
packages/ocaml-pg:
   ocaml-pg.spec (1.11 -> 1.12) , ocaml-pg-calendar.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ocaml-pg/ocaml-pg.spec
diff -u packages/ocaml-pg/ocaml-pg.spec:1.11 packages/ocaml-pg/ocaml-pg.spec:1.12
--- packages/ocaml-pg/ocaml-pg.spec:1.11	Mon Jul 18 10:09:47 2011
+++ packages/ocaml-pg/ocaml-pg.spec	Mon Jul 18 13:50:23 2011
@@ -4,12 +4,13 @@
 Summary(pl.UTF-8):	Wiązania PostgreSQL dla OCamla
 Name:		ocaml-pg
 Version:	1.0
-Release:	7
+Release:	8
 License:	LGPL + OCaml linking exception
 Group:		Libraries
 Source0:	http://merjis.com/_file/pgocaml-%{version}.tar.gz
 # Source0-md5:	4f12ab37e75cc863560600e458e202d5
 Patch0:		%{name}-notest.patch
+Patch1:		%{name}-calendar.patch
 URL:		http://merjis.com/developers/pgocaml/
 BuildRequires:	ocaml >= %{ocaml_ver}
 BuildRequires:	ocaml-calendar-devel
@@ -52,6 +53,7 @@
 %prep
 %setup -q -n pgocaml-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make}
@@ -89,6 +91,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2011/07/18 11:50:23  baggins
+- rel 8
+- fix building with latest calendar
+
 Revision 1.11  2011/07/18 08:09:47  baggins
 - rel 7
 

================================================================
Index: packages/ocaml-pg/ocaml-pg-calendar.patch
diff -u /dev/null packages/ocaml-pg/ocaml-pg-calendar.patch:1.1
--- /dev/null	Mon Jul 18 13:50:28 2011
+++ packages/ocaml-pg/ocaml-pg-calendar.patch	Mon Jul 18 13:50:23 2011
@@ -0,0 +1,22 @@
+--- pgocaml-1.0/pGOCaml.mli~	2011-07-18 13:44:46.752487738 +0200
++++ pgocaml-1.0/pGOCaml.mli	2011-07-18 13:48:17.948487688 +0200
+@@ -1,6 +1,8 @@
+ (* PG'OCaml is a set of OCaml bindings for the PostgreSQL database.
+  * $Id$
+  *)
++open CalendarLib
++open Calendar
+ 
+ type 'a t				(** Database handle. *)
+ 
+--- pgocaml-1.0/pGOCaml.ml~	2007-10-28 21:05:44.000000000 +0100
++++ pgocaml-1.0/pGOCaml.ml	2011-07-18 13:49:33.651487672 +0200
+@@ -4,6 +4,8 @@
+ 
+ open Printf
+ open ExtString
++open CalendarLib
++open Calendar
+ 
+ type 'a t = {
+   ichan : in_channel;			(* In_channel wrapping socket. *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocaml-pg/ocaml-pg.spec?r1=1.11&r2=1.12&f=u