SPECS: ocaml-cairo.spec - finished

[baggins]

Author: baggins                      Date: Wed Apr 11 14:03:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- finished

---- Files affected:
SPECS:
   ocaml-cairo.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/ocaml-cairo.spec
diff -u SPECS/ocaml-cairo.spec:1.1 SPECS/ocaml-cairo.spec:1.2
--- SPECS/ocaml-cairo.spec:1.1	Wed Apr 11 15:42:57 2007
+++ SPECS/ocaml-cairo.spec	Wed Apr 11 16:03:10 2007
@@ -10,11 +10,14 @@
 # cvs -d:pserver:anonymous at cvs.cairographics.org:/cvs/cairo co cairo-ocam
 Source0:	%{name}-%{version}-%{_snap}.tar.gz
 # Source0-md5:	ba63548f5e2eaa5e9f082e737571c2b3
+Patch0:		%{name}-install.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cairo-devel >= 1.2.0
 BuildRequires:	gtk+2-devel >= 2.8
+BuildRequires:	libsvg-cairo-devel
 BuildRequires:	ocaml >= 3.04-7
+BuildRequires:	ocaml-lablgtk2-devel
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,31 +46,52 @@
 
 %prep
 %setup -q -n cairo-ocaml
+%patch0 -p1
 
 %build
 %{__aclocal} -I support
 %{__autoconf}
 %configure
-%{__make}
-%{__make} CC="%{__cc} %{rpmcflags} -fPIC" all opt
+
+%{__make} -j1 CC="%{__cc} %{rpmcflags} -fPIC" all opt
+%{__make} -j1 doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{template,stublibs}
-install *.cm[ixa]* *.a dll*.so $RPM_BUILD_ROOT%{_libdir}/ocaml/template
-install dll*.so $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r foo bar $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r test/{Makefile,*.ml} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/template
-cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/template/META <<EOF
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cairo
+cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/cairo/META <<EOF
 requires = ""
 version = "%{version}"
-directory = "+template"
-archive(byte) = "template.cma"
-archive(native) = "template.cmxa"
+directory = "+cairo"
+archive(byte) = "cairo.cma"
+archive(native) = "cairo.cmxa"
+linkopts = ""
+EOF
+
+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"
+version = "%{version}"
+directory = "+cairo"
+archive(byte) = "cairo_lablgtk.cma"
+archive(native) = "cairo_lablgtk.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"
+version = "%{version}"
+directory = "+cairo"
+archive(byte) = "svg_cairo.cma"
+archive(native) = "svg_cairo.cmxa"
 linkopts = ""
 EOF
 
@@ -80,12 +104,12 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc LICENSE *.mli
-%dir %{_libdir}/ocaml/template
-%{_libdir}/ocaml/template/*.cm[ixa]*
-%{_libdir}/ocaml/template/*.a
+%doc README doc/html src/*.mli
+%dir %{_libdir}/ocaml/cairo
+%{_libdir}/ocaml/cairo/*.cm[ixa]*
+%{_libdir}/ocaml/cairo/*.a
 %{_examplesdir}/%{name}-%{version}
-%{_libdir}/ocaml/site-lib/template
+%{_libdir}/ocaml/site-lib/*cairo*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/04/11 14:03:10  baggins
+- finished
+
 Revision 1.1  2007/04/11 13:42:57  baggins
 - initial revision, WIP
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ocaml-cairo.spec?r1=1.1&r2=1.2&f=u