[packages/ocaml-pg] - updated to 1.7.1

[baggins]

commit 68cd9aefd9d877c06f70bead331f498699d11e84
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Feb 25 19:53:47 2014 +0100

    - updated to 1.7.1

 ocaml-pg-calendar.patch | 22 ----------------------
 ocaml-pg-notest.patch   | 13 -------------
 ocaml-pg.spec           | 32 ++++++++++++++++++--------------
 3 files changed, 18 insertions(+), 49 deletions(-)
---
diff --git a/ocaml-pg.spec b/ocaml-pg.spec
index a8cdeda..e6b218f 100644
--- a/ocaml-pg.spec
+++ b/ocaml-pg.spec
@@ -2,16 +2,17 @@
 Summary:	PostgreSQL binding for OCaml
 Summary(pl.UTF-8):	Wiązania PostgreSQL dla OCamla
 Name:		ocaml-pg
-Version:	1.0
-Release:	8
+Version:	1.7.1
+Release:	0.1
 License:	LGPL + OCaml linking exception
 Group:		Libraries
-Source0:	http://merjis.com/_file/pgocaml-%{version}.tar.gz
-# Source0-md5:	4f12ab37e75cc863560600e458e202d5
+Source0:	http://forge.ocamlcore.org/frs/download.php/1099/pgocaml-%{version}.tgz
+# Source0-md5:	107bf500ea85abadb7cfa012d1ac01e8
 Patch0:		%{name}-notest.patch
 Patch1:		%{name}-calendar.patch
-URL:		http://merjis.com/developers/pgocaml/
+URL:		http://pgocaml.forge.ocamlcore.org/
 BuildRequires:	ocaml >= %{ocaml_ver}
+BuildRequires:	ocaml-batteries-devel
 BuildRequires:	ocaml-calendar-devel
 BuildRequires:	ocaml-camlp4
 BuildRequires:	ocaml-csv-devel
@@ -51,35 +52,38 @@ w kodzie w OCamlu.
 
 %prep
 %setup -q -n pgocaml-%{version}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
 
 %build
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{pgocaml,stublibs}
-
-install *.cm[ixa]* *.a pa_pgsql.cmo $RPM_BUILD_ROOT%{_libdir}/ocaml/pgocaml
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r test* pgocaml_prof.ml $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r tests/*.ml utils/pgocaml_prof.ml $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # META for findlib
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/pgocaml
-echo 'directory = "+pgocaml"' >> META
-install META $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/pgocaml
+echo 'directory = "+pgocaml"' >> src/META
+install src/META $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/pgocaml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc README* BUGS.txt CONTRIBUTORS.txt HOW_IT_WORKS.txt *.mli
+%doc README* doc/*.txt src/*.mli
 %dir %{_libdir}/ocaml/pgocaml
 %{_libdir}/ocaml/pgocaml/*.cm[oixa]*
 %{_libdir}/ocaml/pgocaml/*.a
+%{_libdir}/ocaml/pgocaml/PGOCaml_config.ml
+%{_libdir}/ocaml/pgocaml/pa_pgsql.ml
 %{_examplesdir}/%{name}-%{version}
 %{_libdir}/ocaml/site-lib/pgocaml
diff --git a/ocaml-pg-calendar.patch b/ocaml-pg-calendar.patch
deleted file mode 100644
index 8c3858c..0000000
--- a/ocaml-pg-calendar.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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. *)
diff --git a/ocaml-pg-notest.patch b/ocaml-pg-notest.patch
deleted file mode 100644
index 44c256c..0000000
--- a/ocaml-pg-notest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gocaml-1.0/Makefile~	2007-09-03 20:53:41.000000000 +0200
-+++ gocaml-1.0/Makefile	2007-12-02 13:38:02.000000000 +0100
-@@ -36,7 +36,9 @@
- OBJS	:= pGOCaml_config.cmo pGOCaml.cmo
- XOBJS	:= $(OBJS:.cmo=.cmx)
- 
--all:	pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pa_pgsql.cmo test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) test_pgocaml$(EXECUTABLE_SUFFIX) pgocaml_prof$(EXECUTABLE_SUFFIX) META
-+all:	pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pa_pgsql.cmo pgocaml_prof$(EXECUTABLE_SUFFIX) META
-+
-+test:	test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX) test_pgocaml$(EXECUTABLE_SUFFIX)
- 
- test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX): test_pgocaml_lowlevel.cmo pgocaml.cma
- 	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-pg.git/commitdiff/68cd9aefd9d877c06f70bead331f498699d11e84