packages: ocaml-cairo/ocaml-cairo.spec - cairo module requires bigarray - a...

[qboosh]

Author: qboosh                       Date: Wed Dec  7 17:32:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cairo module requires bigarray
- added pangocairo META file
- provide cairo.lablgtk2 also as subpackage in cairo META file (following Debian and few others)

---- Files affected:
packages/ocaml-cairo:
   ocaml-cairo.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/ocaml-cairo/ocaml-cairo.spec
diff -u packages/ocaml-cairo/ocaml-cairo.spec:1.5 packages/ocaml-cairo/ocaml-cairo.spec:1.6
--- packages/ocaml-cairo/ocaml-cairo.spec:1.5	Tue Dec  6 19:12:49 2011
+++ packages/ocaml-cairo/ocaml-cairo.spec	Wed Dec  7 18:32:38 2011
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: pangocairo META file
 Summary:	Cairo binding for OCaml
 Summary(pl.UTF-8):	Wiązania Cairo dla OCamla
 Name:		ocaml-cairo
@@ -72,14 +71,21 @@
 
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cairo
 cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cairo/META <<EOF
-requires = ""
+requires = "bigarray"
 version = "%{version}"
 directory = "+cairo"
 archive(byte) = "cairo.cma"
 archive(native) = "cairo.cmxa"
 linkopts = ""
+
+package "lablgtk2" (
+	requires "cairo lablgtk2"
+	archive(byte) = "cairo_lablgtk.cma"
+	archive(native) = "cairo_lablgtk.cmxa"
+)
 EOF
 
+# some distros include lablgtk2 subpackage for cairo, we used to provide cairo-lablgtk package
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cairo-lablgtk
 cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cairo-lablgtk/META <<EOF
 requires = "cairo lablgtk2"
@@ -90,6 +96,16 @@
 linkopts = ""
 EOF
 
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/pangocairo
+cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/pangocairo/META <<EOF
+requires = "cairo lablgtk2"
+version = "%{version}"
+directory = "+cairo"
+archive(byte) = "pango_cairo.cma"
+archive(native) = "pango_cairo.cmxa"
+linkopts = ""
+EOF
+
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/svgcairo
 cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/svgcairo/META <<EOF
 requires = "cairo"
@@ -121,6 +137,7 @@
 %{_libdir}/ocaml/cairo/*.a
 %{_libdir}/ocaml/site-lib/cairo
 %{_libdir}/ocaml/site-lib/cairo-lablgtk
+%{_libdir}/ocaml/site-lib/pangocairo
 %{_libdir}/ocaml/site-lib/svgcairo
 %{_examplesdir}/%{name}-%{version}
 
@@ -130,6 +147,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/12/07 17:32:38  qboosh
+- cairo module requires bigarray
+- added pangocairo META file
+- provide cairo.lablgtk2 also as subpackage in cairo META file (following Debian and few others)
+
 Revision 1.5  2011/12/06 18:12:49  qboosh
 - updated to 1.2.0 release
 
================================================================

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