- updated to 1.4

diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index f590db01468b52dd658d9928114ca3e1b43420b0..1fea3946945a5ea58e463c1a2e458dd98aa448ee 100644 (file)
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -2,12 +2,12 @@
 Summary:       OCaml module manager
 Summary(pl.UTF-8):     Zarządca modułów OCamla
 Name:          ocaml-findlib
-Version:       1.3.3
-Release:       2
+Version:       1.4
+Release:       1
 License:       distributable
 Group:         Development/Tools
 Source0:       http://download.camlcity.org/download/findlib-%{version}.tar.gz
-# Source0-md5: a4c22ad5e0d38367a73cf58a25fcbebd
+# Source0-md5: 5d1f8238c53964fdd14387b87b48b5d9
 URL:           http://www.ocaml-programming.de/packages/
 BuildRequires: m4
 BuildRequires: ncurses-devel
@@ -75,16 +75,24 @@ rm -rf $RPM_BUILD_ROOT
 
 # 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
-cp -a $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib \
+ln -sf topfind $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlfind
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib \
        $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.*
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/META
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/META \
+       $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib
 echo 'directory = "+findlib"' >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/META
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/num-top \
+       $RPM_BUILD_ROOT%{_libdir}/ocaml/num-top
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/num-top
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/num-top/META \
+       $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/num-top
+echo 'directory = "+findlib"' >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/num-top/META
+
 echo 'ldconf = "ignore"' >> $RPM_BUILD_ROOT%{_sysconfdir}/ocamlfind.conf
 
-ln -s ../stublibs $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/libexec
-ln -s ../stublibs $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/stublibs
+ln -sf ../stublibs $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/libexec
+ln -sf ../stublibs $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/stublibs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +104,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/safe_camlp4
 %config %{_sysconfdir}/ocamlfind.conf
 %{_libdir}/ocaml/site-lib/findlib
+# symlinks
+%{_libdir}/ocaml/site-lib/libexec
+%{_libdir}/ocaml/site-lib/stublibs
+# META files for base ocaml packages
+%{_libdir}/ocaml/site-lib/bigarray
+%{_libdir}/ocaml/site-lib/camlp4
+%{_libdir}/ocaml/site-lib/dbm
+%{_libdir}/ocaml/site-lib/dynlink
+%{_libdir}/ocaml/site-lib/graphics
+%{_libdir}/ocaml/site-lib/labltk
+%{_libdir}/ocaml/site-lib/num
+%{_libdir}/ocaml/site-lib/num-top
+%{_libdir}/ocaml/site-lib/ocamlbuild
+%{_libdir}/ocaml/site-lib/stdlib
+%{_libdir}/ocaml/site-lib/str
+%{_libdir}/ocaml/site-lib/threads
+%{_libdir}/ocaml/site-lib/unix
 %{_mandir}/man1/ocamlfind.1*
 %{_mandir}/man5/META.5*
 %{_mandir}/man5/findlib.conf.5*
@@ -104,7 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %dir %{_libdir}/ocaml/findlib
+%{_libdir}/ocaml/findlib/Makefile.config
 %{_libdir}/ocaml/findlib/*.cm[ixa]*
 %{_libdir}/ocaml/findlib/*.a
+%{_libdir}/ocaml/num-top/*.cm[ia]
 %{_libdir}/ocaml/ocamlfind
 %{_libdir}/ocaml/topfind