X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ocaml-findlib.spec;h=c9d835ad35e837cad199a263c9b90c641bc62f01;hb=0014a60;hp=437c780a00ca3b645d225e315f8fbb9c3cc09a71;hpb=dc2c204bbfb291754dc3a14470b735e415ec60e9;p=packages%2Focaml-findlib.git

diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 437c780..c9d835a 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -1,19 +1,29 @@
-%define		ocaml_ver	1:3.09.1
+#
+# Conditional build:
+%bcond_without	opt		# build opt
+
+%ifarch x32
+%undefine	with_opt
+%endif
+
+%define		ocaml_ver	1:4.02
 Summary:	OCaml module manager
-Summary(pl):	Zarz±dca modu³ów OCamla
+Summary(pl.UTF-8):	Zarządca modułów OCamla
 Name:		ocaml-findlib
-Version:	1.1.1
-Release:	3
+Version:	1.5.5
+Release:	5
 License:	distributable
 Group:		Development/Tools
-Source0:	http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz
-# Source0-md5:	5f5b1cea586d81d0e3d2d1eb84ebe28a
+Source0:	http://download.camlcity.org/download/findlib-%{version}.tar.gz
+# Source0-md5:	703eae112f9e912507c3a2f8d8c48498
+Patch0:		%{name}-bytes.patch
 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)
 
@@ -23,15 +33,15 @@ components (packages), and includes tools that support this scheme.
 Packages are collections of OCaml modules for which metainformation
 can be stored.
 
-%description -l pl
-Biblioteka "findlib" udostêpnia metodê zarz±dzania komponentami
-oprogramowania (pakietami) oraz zawiera narzêdzia, które ow± metodê
-wspieraj±. Pakiety s± kolekcjami modu³ów w OCamlu, dla których mog±
-byæ przechowywane metainformacje.
+%description -l pl.UTF-8
+Biblioteka "findlib" udostępnia metodę zarządzania komponentami
+oprogramowania (pakietami) oraz zawiera narzędzia, które ową metodę
+wspierają. Pakiety są kolekcjami modułów w OCamlu, dla których mogą
+być przechowywane metainformacje.
 
 %package devel
 Summary:	OCaml module manager
-Summary(pl):	Zarz±dca modu³ów OCamla
+Summary(pl.UTF-8):	Zarządca modułów OCamla
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -43,64 +53,109 @@ can be stored.
 
 This package includes libraries and compiled interfaces of findlib.
 
-%description devel -l pl
-Biblioteka "findlib" udostêpnia metodê zarz±dzania komponentami
-oprogramowania (pakietami) oraz zawiera narzêdzia, które ow± metodê
-wspieraj±. Pakiety s± kolekcjami modu³ów w OCamlu, dla których mog±
-byæ przechowywane metainformacje.
+%description devel -l pl.UTF-8
+Biblioteka "findlib" udostępnia metodę zarządzania komponentami
+oprogramowania (pakietami) oraz zawiera narzędzia, które ową metodę
+wspierają. Pakiety są kolekcjami modułów w OCamlu, dla których mogą
+być przechowywane metainformacje.
 
 Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba.
 
 %prep
 %setup -q -n findlib-%{version}
+%patch0 -p1
 
 %build
 ./configure \
 	-bindir %{_bindir} \
 	-mandir %{_mandir} \
-	-config %{_sysconfdir}/ocamlfind.conf
+	-config %{_sysconfdir}/ocamlfind.conf \
+	-with-toolbox
 
-sed -e 's/-g//' Makefile > Makefile.tmp
-mv -f Makefile.tmp Makefile
+sed -i -e 's/-g//' Makefile
 
-%{__make} all opt
+%{__make} -j1 all %{?with_opt:opt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install prefix=$RPM_BUILD_ROOT
+%{__make} install \
+	prefix=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.mli
+# now provided by ocaml-labltk.spec (might not exist if building without ocaml-labltk installed)
+%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/labltk
+# now provided by ocaml-dbm.spec (might not exist if building without ocaml-dbm installed)
+%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/dbm
 
 # 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 \
+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 -f $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/findlib/*.*
-rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/findlib/META
-echo 'directory = "+findlib"' >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/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
 
 %files
 %defattr(644,root,root,755)
-%doc README LICENSE doc/*-html
-%attr(755,root,root) %{_bindir}/*
+%doc doc/README LICENSE doc/*-html
+%attr(755,root,root) %{_bindir}/ocamlfind
+%attr(755,root,root) %{_bindir}/safe_camlp4
 %config %{_sysconfdir}/ocamlfind.conf
-%{_libdir}/ocaml/site-lib
-%{_mandir}/man[15]/*
+%dir %{_libdir}/ocaml/findlib
+%attr(755,root,root) %{_libdir}/ocaml/findlib/make_wizard
+%{_libdir}/ocaml/findlib/make_wizard.pattern
+%{_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/bytes
+%{_libdir}/ocaml/site-lib/compiler-libs
+%{_libdir}/ocaml/site-lib/dynlink
+%{_libdir}/ocaml/site-lib/graphics
+%{_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
+# camlp4 4.02 doesn't provide its META itself
+%{_libdir}/ocaml/site-lib/camlp4
+%{_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)
-%dir %{_libdir}/ocaml/findlib
-%{_libdir}/ocaml/findlib/*.cm[ixa]*
-%{_libdir}/ocaml/findlib/*.a
+%{_libdir}/ocaml/findlib/Makefile.config
+%{_libdir}/ocaml/findlib/*.cm[xi]
+%{_libdir}/ocaml/findlib/*.cma
+%if %{with opt}
+%{_libdir}/ocaml/findlib/*.[ao]
+%{_libdir}/ocaml/findlib/*.cmxa
+%endif
+%dir %{_libdir}/ocaml/num-top
+%{_libdir}/ocaml/num-top/*.cm[ia]
 %{_libdir}/ocaml/ocamlfind
 %{_libdir}/ocaml/topfind