SPECS: ocaml-extlib.spec - release 2 - use findlib

baggins baggins at pld-linux.org
Fri Mar 10 14:34:17 CET 2006


Author: baggins                      Date: Fri Mar 10 13:34:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 2
- use findlib

---- Files affected:
SPECS:
   ocaml-extlib.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/ocaml-extlib.spec
diff -u SPECS/ocaml-extlib.spec:1.7 SPECS/ocaml-extlib.spec:1.8
--- SPECS/ocaml-extlib.spec:1.7	Sat Dec 10 23:02:05 2005
+++ SPECS/ocaml-extlib.spec	Fri Mar 10 14:34:11 2006
@@ -4,11 +4,12 @@
 Summary(pl):	ExtLib dla OCamla
 Name:		ocaml-%{_vendor_name}
 Version:	1.4
-Release:	1
+Release:	2
 License:	LGPL + OCaml linking exception
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/ocaml-lib/%{_vendor_name}-%{version}.tgz
 # Source0-md5:	d53cf08e13e5b9487035bcc8af1165f2
+BuildRequires:	ocaml-findlib-devel
 BuildRequires:	ocaml >= 3.04-7
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,21 +85,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib
-install *.cm[ixa]* *.a $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib
-
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml %{__make} install
 
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib
-cat > $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib/META <<EOF
-requires = ""
-version = "%{version}"
-directory = "+extlib"
-archive(byte) = "extlib.cma"
-archive(native) = "extlib.cmxa"
-linkopts = ""
-EOF
+mv $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/META \
+	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib
+echo 'directory = "+extlib"' \
+	>> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/extlib/META
+rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/*.mli
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,7 +105,6 @@
 %{_libdir}/ocaml/extlib/*.cm[ixa]*
 %{_libdir}/ocaml/extlib/*.a
 %{_libdir}/ocaml/site-lib/extlib
-%{_examplesdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -118,6 +112,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/03/10 13:34:11  baggins
+- release 2
+- use findlib
+
 Revision 1.7  2005/12/10 22:02:05  baggins
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ocaml-extlib.spec?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list