Summary: The Objective Caml compiler and programming environment
Summary(pl): Kompilator Objektowego Camla oraz ¶rodowisko programistyczne
Name: ocaml
-Version: 3.04
-Release: 7
+Version: 3.06
+Release: 2
License: distributable
Vendor: Group of implementors <caml-light@inria.fr>
Group: Development/Languages
-Source0: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}-refman.info.tar.gz
-Source2: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}-refman.html.tar.gz
-Source3: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}-refman.ps.gz
-Source4: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-refman.html.tar.gz
-Source5: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-refman.ps.gz
-Source6: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-tutorial.html.tar.gz
-Source7: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-tutorial.ps.gz
+Source0: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}/%{name}-%{version}-refman.html.tar.gz
+Source2: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}/%{name}-%{version}-refman.ps.gz
+Source3: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-manual.html.tar.gz
+Source4: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-manual.dvi.gz
+Source5: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-tutorial.html.tar.gz
+Source6: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-tutorial.dvi.gz
+Source7: http://www.oefai.at/~markus/ocaml_sources/pure-fun-1.0.4.tar.bz2
+Source8: http://www.oefai.at/~markus/ocaml_sources/ds-contrib.tar.gz
Patch0: %{name}-build.patch
-Patch1: %{name}-DESTDIR.patch
-Patch2: %{name}-manlinks.patch
-Patch3: %{name}-db3.patch
-Patch4: %{name}-powerpcfix.patch
-Patch5: %{name}-objinfo.patch
-Patch6: %{name}-opt-symbols.patch
+Patch1: %{name}-manlinks.patch
+Patch2: %{name}-db3.patch
+Patch3: %{name}-objinfo.patch
+Patch4: %{name}-opt-symbols.patch
+Patch5: %{name}-mano.patch
URL: http://caml.inria.fr/
Requires: ocaml-runtime = %{version}-%{release}
+Obsoletes: ocaml-ocamldoc
+Provides: ocaml-ocamldoc
BuildRequires: db3-devel
%{!?_without_tk:BuildRequires: tk-devel}
%{!?_without_x11:BuildRequires: XFree86-devel}
Group: Development/Tools
%description doc-ps
-PostScript documentation for OCaml.
+PostScript documentation for OCaml. HTML documentation is in main package.
%description doc-ps -l pl
-Dokumentacja dla OCamla w formacie PostSript.
-
-%package doc-html
-Summary: HTML documentation for OCaml
-Summary(pl): Dokumentacja dla OCaml-a w formacie HTML
-Group: Development/Tools
-
-%description doc-html
-HTML documentation for OCaml.
-
-%description doc-html -l pl
-Dokumentacja dla OCaml-a w formacie HTML.
+Dokumentacja dla OCamla w formacie PostSript. Dokumentacja HTML jest
+w g³ównym pakiecie.
%package emacs
Summary: Emacs mode for OCaml
Pakiet ten zawiera pliki *.cmi oraz *.cmo bêd±ce cze¶ciami kompilatora
OCamla. S± one wymagane do kompilacji niektórych programów.
+%package ocamldoc-devel
+Summary: Files needed to develop programs using ocamldoc
+Summary(pl): Pliki potrzebne do tworzenia programów u¿ywaj±cych ocamldoc
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description ocamldoc-devel
+You need this package if you are going to write ocamldoc front end or
+something like that.
+
+%description ocamldoc-devel -l pl
+Bêdziesz potrzebowaæ tego pakietu, je¶li zamierzasza pisaæ front end
+dla ocamldoc lub co¶ podobnego.
+
+%package lib-source
+Summary: Sources of OCaml standard library
+Summary(pl): ¬ród³a biblioteki standardowej OCamla
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description lib-source
+This sources come helpful during debugging of user programs with ocamldebug.
+
+%description lib-source -l pl
+¬ród³a te co¶ przydatne przy odpluskwianiu programów u¿ytkownika
+z u¿yciem ocamldebug.
+
+# maybe we'll want to add some more stuff here?
+%package examples
+Summary: Example source code for OCaml
+Summary(pl): Przyk³adowe kody ¼ród³owe w OCamlu
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description examples
+This packages contains sources for Okasaki's Purely Functional
+Datastructures in OCaml, along with some contributions.
+
+%description examples -l pl
+Pakiet ten zawiera ¼ród³a Czysto-Funkcjonalnych Struktur Danych
+Okasaki'ego, prze³o¿one na OCamla, wraz z dodatkami.
+
%prep
%setup -q -T -b 0
%setup -q -T -D -a 1
-%setup -q -T -D -a 2
+%setup -q -T -D -c -n %{name}-%{version}/examples -a 7
+%setup -q -T -D -c -n %{name}-%{version}/examples -a 8
+%setup -q -T -D -n %{name}-%{version} -a 3
+%setup -q -T -D -n %{name}-%{version} -a 5
# order mess with docs somewhat
mkdir docs
mkdir docs/html
mv htmlman docs/html/ocaml
-cp %{SOURCE3} docs/ocaml.ps.gz
-%setup -q -T -D -a 4
-mv camlp4-%{version}-refman.html docs/html/camlp4
-cp %{SOURCE5} docs/camlp4.ps.gz
-%setup -q -T -D -a 6
+cp %{SOURCE2} docs/ocaml.ps.gz
+mv camlp4-%{version}-manual.html docs/html/camlp4
+cp %{SOURCE4} docs/camlp4.ps.gz
mv camlp4-%{version}-tutorial.html docs/html/camlp4-tutorial
-cp %{SOURCE7} docs/camlp4-tutorial.ps.gz
-
+cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%ifarch ppc
-%patch4 -p1
-%endif
+#%patch4 -p1
%patch5 -p1
-%patch6 -p1
%build
./configure \
-libdir %{_libdir}/%{name} \
-mandir %{_mandir}/man1 \
-host %{_host} \
- %{?_without_tk:-notk} \
+ %{?_without_tk:-no-tk} \
-with-pthread
-# this is crude hack (works in addition to ocaml-db3.patch)
-cp config/Makefile config/Makefile.tmp
-sed -e 's|-ldb1|-ldb|; s|-I%{_includedir}/db1||' < config/Makefile.tmp > config/Makefile
-
-%{__make} world bootstrap opt ocamlc.opt ocamlopt.opt
-%{__make} -C camlp4 optp4
+%{__make} world bootstrap opt.opt
%{__make} -C tools objinfo
-# hack info pages to contain dir entry
-cat <<EOF >infoman/ocaml.info
-INFO-DIR-SECTION Programming Languages:
-START-INFO-DIR-ENTRY
-* Ocaml: (ocaml). The Ocaml language
-END-INFO-DIR-ENTRY
-EOF
-zcat infoman/ocaml.info.gz >> infoman/ocaml.info
-
-gzip -9nf infoman/ocaml.info
-
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_infodir}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}
+
+cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
+%{_libdir}/%{name}/stublibs
+%{_libdir}/%{name}
+EOF
%if %{!?_without_emacs:1}%{?_without_emacs:0}
%{__make} -C emacs DESTDIR=$RPM_BUILD_ROOT install \
EMACS="`if [ -x %{_bindir}/emacs ]; then echo emacs; \
else echo xemacs; fi`" \
- EMACSDIR="%{_libdir}/emacs/site-lisp"
+ EMACSDIR="$RPM_BUILD_ROOT%{_libdir}/emacs/site-lisp"
%endif
# symlink .opt versions of compilers (if present)
-for f in ocamlc ocamlopt; do
+# warning: don't do that with camlp4 (can't load extensions then)
+for f in ocamlc ocamlopt ocamldoc ocamllex; do
if test -f $RPM_BUILD_ROOT%{_bindir}/$f.opt; then
mv -f $RPM_BUILD_ROOT%{_bindir}/$f \
$RPM_BUILD_ROOT%{_bindir}/$f.byte
fi
done
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.ml{,i}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.mli
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*/*.ml{,i}
# move includes to the proper place
# but leave compatibility symlink
ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/%{name}/caml
-# compiled sourec of compiler, needed by some programs
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler
-cp {{asm,byte}comp,parsing,typing,utils}/*.{cmi,cmo,cmx,o} \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler
+# compiled sources of compiler, needed by some programs
+for f in {asm,byte}comp parsing typing utils ; do
+ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f
+ cp $f/*.{cmi,cmo,cmx,o} $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f
+done
# this isn't installed by default, but is useful
install tools/objinfo $RPM_BUILD_ROOT%{_bindir}/ocamlobjinfo
-# instead of adding new directories to ld.conf, we use single dirctory
-# for dlls comming from other packages, they should be symlinked here
-echo %{_libdir}/%{name} > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf
-
-%{!?_without_tk:(cd $RPM_BUILD_ROOT%{_libdir}/%{name} && ln -s labltk/dll*.so .)}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install -d $RPM_BUILD_ROOT%{_examplesdir}
-mv otherlibs/labltk/example $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version}
+cp -r otherlibs/labltk/examples* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version}
ln -sf %{_libdir}/%{name}/{scrape,add}labels $RPM_BUILD_ROOT%{_bindir}
-install infoman/*info* $RPM_BUILD_ROOT%{_infodir}
-
-gzip -9nf LICENSE Changes README Upgrading
+# shutup checkfiles
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-
%files runtime
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ocamlrun
-%attr(755,root,root) %{_libdir}/%{name}/dll[bmnstu]*.so
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/stublibs
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dll*.so
+%exclude %{_libdir}/%{name}/stublibs/dllgraphics.so
+%exclude %{_libdir}/%{name}/stublibs/dlllabltk.so
+%exclude %{_libdir}/%{name}/stublibs/dlltkanim.so
%files
%defattr(644,root,root,755)
-%doc *.gz
-%attr(755,root,root) %{_bindir}/ocaml
-%attr(755,root,root) %{_bindir}/ocaml[cmdlopy]*
+%doc LICENSE Changes README Upgrading
+%doc docs/html/ocaml
+%attr(755,root,root) %{_bindir}/ocaml*
+%exclude %{_bindir}/ocamlbrowser
+%exclude %{_bindir}/ocamlrun
%attr(755,root,root) %{_bindir}/*labels
%{_includedir}/caml
%{_libdir}/%{name}/caml
%{_libdir}/%{name}/threads
-%{_libdir}/%{name}/[abefhimnopqrstuw]*.*
-%{_libdir}/%{name}/callback.*
-%{_libdir}/%{name}/char.*
-%{_libdir}/%{name}/dbm.*
-%{_libdir}/%{name}/digest.*
-%{_libdir}/%{name}/dynlink.*
-%{_libdir}/%{name}/g[ce]*.*
-%{_libdir}/%{name}/l*.cm*
-%{_libdir}/%{name}/lib[abc]*.a
-%{_libdir}/%{name}/libmldbm.a
-%{_libdir}/%{name}/lib[nstu]*.a
+%{_libdir}/%{name}/*.a
+%{_libdir}/%{name}/*.o
+%{_libdir}/%{name}/*.cm*
+%exclude %{_libdir}/%{name}/*graphics*
%{_libdir}/%{name}/ld.conf
-%attr(755,root,root) %{_libdir}/%{name}/expunge
-%attr(755,root,root) %{_libdir}/%{name}/extract_crc
%{_libdir}/%{name}/camlheader
%{_libdir}/%{name}/camlheader_ur
+%dir %{_libdir}/%{name}/ocamldoc
+%{_libdir}/%{name}/ocamldoc/*.sty
+%{_libdir}/%{name}/ocamldoc/*.hva
+%attr(755,root,root) %{_libdir}/%{name}/expunge
+%attr(755,root,root) %{_libdir}/%{name}/extract_crc
%attr(755,root,root) %{_libdir}/%{name}/*labels
-%{_mandir}/man*/*ocaml*
-%{_infodir}/*
+%{_mandir}/man1/*ocaml*
+
+%files lib-source
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/*.ml
+
+%files examples
+%{_examplesdir}/%{name}-%{version}
+
+# they are poor, html is much better
+#%files manpages
+#%{_mandir}/man3/*
%files devel
%defattr(644,root,root,755)
%files camlp4
%defattr(644,root,root,755)
+%doc docs/html/camlp4*
%attr(755,root,root) %{_bindir}/*camlp4*
%attr(755,root,root) %{_bindir}/ocpp
-%attr(755,root,root) %{_bindir}/odyl
+# Not installed since 3.05, is is needed?
+#%attr(755,root,root) %{_bindir}/odyl
%{_libdir}/%{name}/camlp4
%{_mandir}/man*/*camlp4*
%{_mandir}/man*/*ocpp*
%files labltk
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/labltk/dlllabltk*
-%{_libdir}/%{name}/dlllabltk*
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlllabltk.so
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlltkanim.so
%endif
%if %{!?_without_x11:1}%{?_without_x11:0}
%files x11graphics-devel
%defattr(644,root,root,755)
-%{_libdir}/%{name}/graphics*
+%{_libdir}/%{name}/graphics*.cm*
+%{_libdir}/%{name}/graphics.a
%{_libdir}/%{name}/libgraphics.a
%files x11graphics
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/dllgraphics.so
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dllgraphics.so
%endif
%if %{!?_without_emacs:1}%{?_without_emacs:0}
%files emacs
%defattr(644,root,root,755)
-%{_libdir}/emacs/site-lisp/*.el
+%{_libdir}/emacs/site-lisp/*.el*
%endif
-%files doc-ps
+%files ocamldoc-devel
%defattr(644,root,root,755)
-%doc docs/*.ps.gz
+%{_libdir}/%{name}/ocamldoc/*.cm*
+%{_libdir}/%{name}/ocamldoc/*.a
-%files doc-html
+%files doc-ps
%defattr(644,root,root,755)
-%doc docs/html/*
+%doc docs/*.ps.gz