packages: ocaml-findlib/ocaml-findlib.spec - updated to 1.2.6

qboosh qboosh at pld-linux.org
Sun Mar 13 09:38:51 CET 2011


Author: qboosh                       Date: Sun Mar 13 08:38:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.6

---- Files affected:
packages/ocaml-findlib:
   ocaml-findlib.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/ocaml-findlib/ocaml-findlib.spec
diff -u packages/ocaml-findlib/ocaml-findlib.spec:1.31 packages/ocaml-findlib/ocaml-findlib.spec:1.32
--- packages/ocaml-findlib/ocaml-findlib.spec:1.31	Sat Apr 18 19:01:19 2009
+++ packages/ocaml-findlib/ocaml-findlib.spec	Sun Mar 13 09:38:46 2011
@@ -3,18 +3,19 @@
 Summary:	OCaml module manager
 Summary(pl.UTF-8):	Zarządca modułów OCamla
 Name:		ocaml-findlib
-Version:	1.2.4
-Release:	2
+Version:	1.2.6
+Release:	1
 License:	distributable
 Group:		Development/Tools
-Source0:	http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz
-# Source0-md5:	52cfcacff3e07a94bc3adb977fbb3c07
+Source0:	http://download.camlcity.org/download/findlib-%{version}.tar.gz
+# Source0-md5:	4924c8c3ef1208eb0fa9096c8b8bb72f
 URL:		http://www.ocaml-programming.de/packages/
 BuildRequires:	m4
 BuildRequires:	ncurses-devel
 BuildRequires:	ocaml >= %{ocaml_ver}
 BuildRequires:	ocaml-camlp4
 BuildRequires:	ocaml-labltk-devel
+BuildRequires:	sed >= 4.0
 %requires_eq	ocaml
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,26 +62,25 @@
 	-mandir %{_mandir} \
 	-config %{_sysconfdir}/ocamlfind.conf
 
-sed -e 's/-g//' Makefile > Makefile.tmp
-mv -f Makefile.tmp Makefile
+sed -i -e 's/-g//' Makefile
 
 %{__make} -j1 all opt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install prefix=$RPM_BUILD_ROOT
+%{__make} install \
+	prefix=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli
 
 # in PLD only META files are stored in site-lib/pkg
 sed -i -e 's|/site-lib||' $RPM_BUILD_ROOT%{_libdir}/ocaml/topfind
 ln -sf %{_libdir}/ocaml/topfind $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlfind
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib
 cp -a $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib \
 	$RPM_BUILD_ROOT%{_libdir}/ocaml/findlib
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.*
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/META
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/META
 echo 'directory = "+findlib"' >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/META
 echo 'ldconf = "ignore"' >> $RPM_BUILD_ROOT%{_sysconfdir}/ocamlfind.conf
 
@@ -93,10 +93,14 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/README LICENSE doc/*-html
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/ocamlfind
+%attr(755,root,root) %{_bindir}/safe_camlp4
 %config %{_sysconfdir}/ocamlfind.conf
 %{_libdir}/ocaml/site-lib
-%{_mandir}/man[15]/*
+%{_mandir}/man1/ocamlfind.1*
+%{_mandir}/man5/META.5*
+%{_mandir}/man5/findlib.conf.5*
+%{_mandir}/man5/site-lib.5*
 
 %files devel
 %defattr(644,root,root,755)
@@ -112,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2011/03/13 08:38:46  qboosh
+- updated to 1.2.6
+
 Revision 1.31  2009/04/18 17:01:19  areq
 - make -j1
 
================================================================

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



More information about the pld-cvs-commit mailing list