-
-# conditional build:
-# --without emacs
-# --without tk
-# --without x11 (implies --without tk)
-
-%{?_without_x11:%define _without_tk 1}
+#
+# Conditional build:
+%bcond_without emacs # without emacs subpackage
+%bcond_without x # without X11 support
+%bcond_without tk # without Tcl/Tk support
+#
+# --without x11 implies --without tk
+%{!?with_x:%undefine with_tk}
+
+%define p4ver 3.06
+%define sver 3.09
Summary: The Objective Caml compiler and programming environment
-Summary(pl): Kompilator Objektowego Camla oraz ¶rodowisko programistyczne
+Summary(pl.UTF-8): Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
Name: ocaml
-Version: 3.04
-Release: 9
+Version: 3.09.3
+Release: 1
+Epoch: 1
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.html.tar.gz
-Source2: ftp://ftp.inria.fr/lang/caml-light/%{name}-%{version}-refman.ps.gz
-Source3: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-refman.html.tar.gz
-Source4: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{version}-refman.ps.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.ps.gz
+Source0: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.bz2
+# Source0-md5: 8b3744efd0d51b82d55b61d0e2bf0e2b
+Source1: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
+# Source1-md5: b25eb211bf91bcaa536b12d12731ceec
+Source2: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.gz
+# Source2-md5: 598bb8e86329afe1ae374385b2e177e7
+Source3: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.html.tar.gz
+# Source3-md5: 21370bae4e7f6435b38aeb21db7ce8bb
+Source4: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.dvi.gz
+# Source4-md5: 035915d1a530aa7ec9b194d9a7d258eb
+Source5: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.html.tar.gz
+# Source5-md5: 96d8eb4ca5abd58c9a280ba59f73b192
+Source6: ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.dvi.gz
+# Source6-md5: fcd87c235109364242a0c9ccf176dff8
+Source7: http://www.ocaml.info/ocaml_sources/pure-fun-1.0.6.tar.bz2
+# Source7-md5: 94eac3fa1ac51b8ada344b04839cb43c
+Source8: http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
+# Source8-md5: 77fa1da7375dea1393cc0b6cd802d7e1
+Source9: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz
+# Source9-md5: 280160b1fc7c8513074c3fda0446de29
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}-db3.patch
+Patch2: %{name}-objinfo.patch
+Patch3: %{name}-tk85support.patch
+Patch4: %{name}-CFLAGS.patch
+Patch5: %{name}-as_needed.patch
URL: http://caml.inria.fr/
-Requires: ocaml-runtime = %{version}-%{release}
-BuildRequires: db3-devel
-%{!?_without_tk:BuildRequires: tk-devel}
-%{!?_without_x11:BuildRequires: XFree86-devel}
-%{!?_without_emacs:BuildRequires: xemacs}
-%{!?_without_emacs:BuildRequires: xemacs-common}
-%{!?_without_emacs:BuildRequires: xemacs-fsf-compat-pkg}
+BuildRequires: db-devel >= 4.1
+%{?with_tk:BuildRequires: tk-devel}
+%{?with_x:BuildRequires: xorg-lib-libX11-devel}
+%if %{with emacs}
+BuildRequires: sed >= 4.0
+BuildRequires: xemacs
+BuildRequires: xemacs-common
+BuildRequires: xemacs-fsf-compat-pkg
+%endif
+Requires: %{name}-runtime = %{epoch}:%{version}-%{release}
+Provides: ocaml-ocamldoc
+Obsoletes: ocaml-ocamldoc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define specflags -fno-strict-aliasing
%description
Objective Caml is a high-level, strongly-typed, functional and
system, Lex&Yacc tools, a replay debugger, and a comprehensive
library.
-%description -l pl
-Objektowy Caml jest funkcjonalnym, obiektowo zorientowanym jêzykiem
-wysokiego poziomu z rodziny jêzyków ML.
+%description -l pl.UTF-8
+OCaml (Objective Caml) jest funkcyjnym, obiektowo zorientowanym językiem
+wysokiego poziomu z silnym typowaniem. Należy do rodziny języków ML.
-Ten pakiet zawiera dwa kompilatory (szybki kompilator bytecode oraz
-zoptymalizowany natywny kompilator), interaktywny g³ówny system,
-narzêdzia Lex&Yacc, odpluskwiacz i biblioteki.
+Ten pakiet zawiera dwa kompilatory (szybki kompilator do bajtkodu
+oraz optymalizujący kompilator do kodu natywnego), interaktywne środowisko
+pracy, narzędzia do tworzenia analizatorów leksykalnych oraz składniowych
+(ocamllex, ocamlyacc), odpluskwiacz (ocamldebug) i biblioteki.
+
+%package runtime
+Summary: Runtime system for OCaml
+Summary(pl.UTF-8): Środowisko uruchomieniowe dla OCamla
+Group: Libraries
+
+%description runtime
+This package contains binaries needed to run bytecode OCaml programs:
+ocamlrun bytecode interpreter, and basic dynamic link libraries.
+
+%description runtime -l pl.UTF-8
+Pakiet ten zawiera binaria potrzebne do uruchamiania programów w
+OCamlu skompilowanych do bajtkodu: interpreter bajtkodu (ocamlrun) oraz
+podstawowe biblioteki linkowane dynamicznie.
+
+%package lib-source
+Summary: Sources of OCaml standard library
+Summary(pl.UTF-8): Źródła biblioteki standardowej OCamla
+Group: Development/Languages
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description lib-source
+This sources come helpful during debugging of user programs with ocamldebug.
+
+%description lib-source -l pl.UTF-8
+Źródła te są przydatne przy odpluskwianiu programów użytkownika
+z użyciem ocamldebug.
+
+%package doc-html
+Summary: HTML documentation for OCaml
+Summary(pl.UTF-8): Dokumentacja dla OCamla w formacie HTML
+Group: Development/Tools
+
+%description doc-html
+HTML documentation for OCaml.
+
+%description doc-html -l pl.UTF-8
+Dokumentacja dla OCamla w formacie HTML.
%package doc-ps
Summary: PostScript documentation for OCaml
-Summary(pl): Dokumentacja dla OCaml-a w formacie PostSript
+Summary(pl.UTF-8): Dokumentacja dla OCamla w formacie PostScript
Group: Development/Tools
%description doc-ps
PostScript documentation for OCaml.
-%description doc-ps -l pl
-Dokumentacja dla OCamla w formacie PostSript.
+%description doc-ps -l pl.UTF-8
+Dokumentacja dla OCamla w formacie PostScript.
+
+%package doc-info
+Summary: Info documentation for OCaml
+Summary(pl.UTF-8): Dokumentacja info dla OCamla
+Group: Development/Tools
+
+%description doc-info
+Info documentation for OCaml.
+
+%description doc-info -l pl.UTF-8
+Dokumentacja info dla OCamla.
%package emacs
Summary: Emacs mode for OCaml
-Summary(pl): Tryb Emacsa dla OCaml
+Summary(pl.UTF-8): Tryb OCamla dla Emacsa
Group: Development/Tools
-Requires: %{name} = %{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description emacs
Emacs mode files for Objective Caml language.
-%description emacs -l pl
-Pliki trybu Emacsa dla jêzyka Objektowego Camla.
+%description emacs -l pl.UTF-8
+Pliki trybu OCamla dla Emacsa.
-%package runtime
-Summary: Runtime system for OCaml
-Summary(pl): ¦rodowisko uruchomieniowe dla OCamla
+%package labltk
+Summary: Runtime for LablTk library
+Summary(pl.UTF-8): Środowisko uruchomieniowe dla biblioteki LablTk
Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
-%description runtime
-This package contains binaries needed to run bytecode OCaml programs:
-ocamlrun bytecode interpreter, and basic dynamic link libraries.
+%description labltk
+LablTk gives OCaml program access to Tcl/Tk GUI widgets. This package
+contains files needed to run bytecode OCaml programs using LablTk.
-%description runtime -l pl
-Pakiet ten zawiera binaria potrzebne do uruchamiania programów w
-OCamlu skompilowanych do bytecodu: interpreter bytecodu ocamlrun oraz
-podstawowe bibliotki linkowane dynamicznie.
+%description labltk -l pl.UTF-8
+Biblioteka LablTk daje programom napisanym w OCamlu dostęp do widgetów
+Tcl/Tk. Pakiet ten zawiera binaria potrzebne do uruchamiania programów
+używających LablTk.
%package labltk-devel
-Summary: LabelTk library for OCaml
-Summary(pl): Biblioteka LablTk dla OCamla
+Summary: LablTk library for OCaml
+Summary(pl.UTF-8): Biblioteka LablTk dla OCamla
Group: Development/Libraries
-Requires: %{name}-labltk = %{version}-%{release}
+Requires: %{name}-labltk = %{epoch}:%{version}-%{release}
%description labltk-devel
LablTk gives OCaml program access to Tcl/Tk GUI widgets. This package
contains files needed to develop OCaml programs using LablTk.
-%description labltk-devel -l pl
-Biblioteka LablTk daje programom napisanym w OCamlu dostêp do widgetów
-Tcl/Tk. Pakiet ten zawiera pliki niezbêdne do tworzenia programów
-u¿ywaj±cych LablTk.
+%description labltk-devel -l pl.UTF-8
+Biblioteka LablTk daje programom napisanym w OCamlu dostęp do widgetów
+Tcl/Tk. Pakiet ten zawiera pliki niezbędne do tworzenia programów
+używających LablTk.
-%package labltk
-Summary: Runtime for LabelTk library
-Summary(pl): ¦rodowisko uruchomieniowe dla biblioteki LablTk
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
+%package x11graphics
+Summary: X11 graphic output for OCaml
+Summary(pl.UTF-8): Dostęp do X11 dla OCamla
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
-%description labltk
-LablTk gives OCaml program access to Tcl/Tk GUI widgets. This package
-contains files needed to run bytecode OCaml programs using LablTk.
+%description x11graphics
+x11graphics module gives OCaml program access to drawing in X11
+windows. This package contains files needed to run bytecode OCaml
+programs using x11graphics.
-%description labltk -l pl
-Biblioteka LablTk daje programom napisanym w OCamlu dostêp do widgetów
-Tcl/Tk. Pakiet ten zawiera binaria potrzebne do uruchamiania programów
-u¿ywaj±cych LablTk.
+%description x11graphics -l pl.UTF-8
+Moduł x11graphics daje programom napisanym w OCamlu możliwość
+korzystania z interfejsu graficznego X11. Pakiet ten zawiera binaria
+potrzebne do uruchamiania programów używających x11graphics.
%package x11graphics-devel
Summary: X11 graphic output for OCaml
-Summary(pl): Iksowe wyj¶cie graficzne dla OCamla
+Summary(pl.UTF-8): Dostęp do X11 dla OCamla
Group: Development/Libraries
-Requires: %{name}-x11graphics = %{version}-%{release}
+Requires: %{name}-x11graphics = %{epoch}:%{version}-%{release}
%description x11graphics-devel
x11graphics module gives OCaml program access to drawing in X11
windows. This package contains files needed to develop OCaml programs
using x11graphics.
-%description x11graphics-devel -l pl
-Modu³ x11graphics daje programom napisanym w OCamlu dostêp do
-rysowania po oknach X11. Pakiet ten zawiera pliki niezbêdne do
-tworzenia programów u¿ywaj±cych x11graphics.
-
-%package x11graphics
-Summary: X11 graphic output for OCaml
-Summary(pl): Iksowe wyj¶cie graficzne dla OCamla
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description x11graphics
-x11graphics module gives OCaml program access to drawing in X11
-windows. This package contains files needed to run bytecode OCaml
-programs using x11graphics.
-
-%description x11graphics -l pl
-Modu³ x11graphics daje programom napisanym w OCamlu dostêp do
-rysowania po oknach X11. Pakiet ten zawiera binaria potrzebne do
-uruchamiania programów u¿ywaj±cych x11graphics.
+%description x11graphics-devel -l pl.UTF-8
+Moduł x11graphics daje programom napisanym w OCamlu możliwość
+korzystania z interfejsu graficznego X11. Pakiet ten zawiera pliki
+niezbędne do tworzenia programów używających x11graphics.
%package camlp4
Summary: Objective Caml Preprocessor
-Summary(pl): Preprocesor Ocamla
+Summary(pl.UTF-8): Preprocesor OCamla
Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Provides: camlp4 = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: camlp4 = %{epoch}:%{version}-%{release}
Obsoletes: camlp4
%description camlp4
Camlp4 can pretty print the normal Ocaml concrete syntax or the
revised one. It is therefore always possible to have a version of your
-sources compilable by the compiler Objective Caml without
+sources compilable by the Objective Caml compiler without
preprocessing.
-%description camlp4 -l pl
-Camlp4 jest preprocesorem dla Ocamla. Oferuje narzêdzia do sk³adni
-(gramatyki) oraz umiejêtno¶æ modyfikowania konkretnej sk³adni jêzyka
-(cytowania, rozszerzenia).
+%description camlp4 -l pl.UTF-8
+Camlp4 jest preprocesorem OCamla. Oferuje narzędzia do manipulowania
+składnią (gramatyki) oraz możliwość modyfikowania oryginalnej składni
+języka (cytowania, rozszerzenia).
+
+Camlp4 może sparsować oryginalną składnię Ocamla lub dowolną inną
+definiowalną przez użytkownika. Jako przykład podana jest alternatywna
+składnia (revised syntax), która próbuje poprawić drobne problemy
+występujące w składni oryginalnej.
+
+Camlp4 umie ładnie formatować źródła zarówno w oryginalnej jak i
+poprawionej składni OCamla. Potrafi także tłumaczyć programy z jednej
+składni na drugą.
+
+%package camlp4-doc-html
+Summary: Objective Caml Preprocessor - HTML documentation
+Summary(pl.UTF-8): Preprocesor OCamla - dokumentacja HTML
+Group: Development/Languages
-Camlp4 mo¿e sparsowaæ normaln± sk³adniê Ocamla lub inn± dowoln±
-definiowaln± przez u¿ytkownika. Jako przyk³ad jest podana alternatywna
-sk³adnia, nazwana "poprawiona", poniewa¿ próbuje poprawiæ drobne
-problemy ze zwyk³± sk³adni±.
+%description camlp4-doc-html
+Objective Caml Preprocessor - HTML documentation.
-Camlp4 umie ³adnie wypisaæ normaln± sk³adniê Camla lub "poprawion±".
-Dziêki temu jest mo¿liwe posiadanie wersji swoich ¼róde³
-kompilowalnych przez kompilatora Ocamla bez preprocesingu.
+%description camlp4-doc-html -l pl.UTF-8
+Preprocesor OCamla - dokumentacja HTML.
-%package devel
+%package compiler-objects
Summary: Compiled parts of OCaml compiler
-Summary(pl): Skompilowane kawa³ki kompilatora OCamla
+Summary(pl.UTF-8): Skompilowane części kompilatora OCamla
Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: ocaml-devel
+Provides: ocaml-devel
-%description devel
+%description compiler-objects
This package contains *.cmi and *.cmo files being parts of OCaml
compiler. They are needed to compile some programs.
-%description devel -l pl
-Pakiet ten zawiera pliki *.cmi oraz *.cmo bêd±ce cze¶ciami kompilatora
-OCamla. S± one wymagane do kompilacji niektórych programów.
+%description compiler-objects -l pl.UTF-8
+Pakiet ten zawiera pliki *.cmi oraz *.cmo będące częś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.UTF-8): Pliki potrzebne do tworzenia programów używających ocamldoc
+Group: Development/Languages
+Requires: %{name} = %{epoch}:%{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.UTF-8
+Będziesz potrzebować tego pakietu, jeśli zamierzasz pisać front end
+dla ocamldoc lub coś podobnego.
+
+# maybe we'll want to add some more stuff here?
+%package examples
+Summary: Example source code for OCaml
+Summary(pl.UTF-8): Przykładowe kody źródłowe w OCamlu
+Group: Development/Languages
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description examples
+This packages contains sources for Okasaki's Purely Functional
+Datastructures in OCaml, along with some contributions.
+
+%description examples -l pl.UTF-8
+Pakiet ten zawiera źródła Czysto Funkcyjnych Struktur Danych
+autorstwa Okasaki'ego, napisane w OCamlu, wraz z dodatkami.
%prep
-%setup -q -T -b 0
-%setup -q -T -D -a 1
+%setup -q -a1 -a3 -a5
+mkdir examples
+tar xjf %{SOURCE7} -C examples
+tar xzf %{SOURCE8} -C examples
+tar xzf %{SOURCE9}
# order mess with docs somewhat
-mkdir docs
-mkdir docs/html
+mkdir -p docs/html
mv htmlman docs/html/ocaml
cp %{SOURCE2} docs/ocaml.ps.gz
-%setup -q -T -D -a 3
-mv camlp4-%{version}-refman.html docs/html/camlp4
+mv camlp4-%{p4ver}-manual.html docs/html/camlp4
cp %{SOURCE4} docs/camlp4.ps.gz
-%setup -q -T -D -a 5
-mv camlp4-%{version}-tutorial.html docs/html/camlp4-tutorial
+mv camlp4-%{p4ver}-tutorial.html docs/html/camlp4-tutorial
cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
-
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%ifarch ppc
%patch4 -p1
-%endif
%patch5 -p1
-%patch6 -p1
-%build
+%build
+cp -f /usr/share/automake/config.sub config/gnu
./configure \
- -cc "%{__cc} %{rpmcflags}" \
+ -cc "%{__cc}" \
-bindir %{_bindir} \
-libdir %{_libdir}/%{name} \
-mandir %{_mandir}/man1 \
-host %{_host} \
- %{?_without_tk:-notk} \
- -with-pthread
+ %{!?with_tk:-no-tk} \
+ -with-pthread \
+ -x11lib %{_libdir}
-# 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} -C tools objinfo
+%{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
+%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}}
+
+%{__make} install \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
+%{_libdir}/%{name}/stublibs
+%{_libdir}/%{name}
+EOF
-%if %{!?_without_emacs:1}%{?_without_emacs:0}
+%if %{with emacs}
%{__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%{_datadir}/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}/*/*.ml{,i}
-
# move includes to the proper place
-install -d $RPM_BUILD_ROOT%{_includedir}
mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/caml $RPM_BUILD_ROOT%{_includedir}/caml
# but leave compatibility symlink
ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/%{name}/caml
# this isn't installed by default, but is useful
install tools/objinfo $RPM_BUILD_ROOT%{_bindir}/ocamlobjinfo
+cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -r otherlibs/labltk/examples* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version}
+ln -sf %{_libdir}/%{name}/{scrape,add}labels $RPM_BUILD_ROOT%{_bindir}
-# 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 .)}
+# shutup checkfiles
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
-install -d $RPM_BUILD_ROOT%{_examplesdir}
-mv otherlibs/labltk/example $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version}
-
-ln -sf %{_libdir}/%{name}/{scrape,add}labels $RPM_BUILD_ROOT%{_bindir}
+# install info pages
+cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
%clean
rm -rf $RPM_BUILD_ROOT
-%files runtime
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ocamlrun
-%attr(755,root,root) %{_libdir}/%{name}/dll[bmnstu]*.so
+%post doc-info
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
+%postun doc-info
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
%files
%defattr(644,root,root,755)
%doc LICENSE Changes README Upgrading
-%doc docs/html/*
-%attr(755,root,root) %{_bindir}/ocaml
-%attr(755,root,root) %{_bindir}/ocaml[cmdlopy]*
+%attr(755,root,root) %{_bindir}/ocaml*
+%{!?_without_tk:%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
+%dir %{_libdir}/%{name}/vmthreads
+%dir %{_libdir}/%{name}/vmthreads/*.cm*
+%dir %{_libdir}/%{name}/vmthreads/*.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/*.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*
+%{_mandir}/man1/*ocaml*
-%files devel
+%files runtime
%defattr(644,root,root,755)
-%{_libdir}/%{name}/compiler
+%attr(755,root,root) %{_bindir}/ocamlrun
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/stublibs
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dll*.so
+%exclude %{_libdir}/%{name}/stublibs/dllgraphics.so
+%if %{with tk}
+%exclude %{_libdir}/%{name}/stublibs/dlllabltk.so
+%exclude %{_libdir}/%{name}/stublibs/dlltkanim.so
+%endif
-%files camlp4
+%files lib-source
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*camlp4*
-%attr(755,root,root) %{_bindir}/ocpp
-%attr(755,root,root) %{_bindir}/odyl
-%{_libdir}/%{name}/camlp4
-%{_mandir}/man*/*camlp4*
-%{_mandir}/man*/*ocpp*
+%{_libdir}/%{name}/*.ml
+%{_libdir}/%{name}/*.mli
+%{_libdir}/%{name}/*/*.mli
+
+%files doc-html
+%defattr(644,root,root,755)
+%doc docs/html/ocaml/*
+
+%files doc-ps
+%defattr(644,root,root,755)
+%doc docs/*.ps.gz
+
+%files doc-info
+%defattr(644,root,root,755)
+%{_infodir}/ocaml.info*
+
+# they are poor, html is much better
+#%files manpages
+#%%{_mandir}/man3/*
+
+%if %{with emacs}
+%files emacs
+%defattr(644,root,root,755)
+%{_datadir}/emacs/site-lisp/*.el*
+%endif
+
+%if %{with tk}
+%files labltk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlllabltk.so
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlltkanim.so
-%if %{!?_without_tk:1}%{?_without_tk:0}
%files labltk-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/labltk
%{_libdir}/%{name}/labltk/*.a
%attr(755,root,root) %{_libdir}/%{name}/labltk/tkcompiler
%{_examplesdir}/%{name}-labltk-%{version}
+%endif
-%files labltk
+%if %{with x}
+%files x11graphics
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/labltk/dlllabltk*
-%{_libdir}/%{name}/dlllabltk*
-%endif
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dllgraphics.so
-%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
+%endif
-%files x11graphics
+%files camlp4
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/dllgraphics.so
-%endif
+%attr(755,root,root) %{_bindir}/*camlp4*
+%attr(755,root,root) %{_bindir}/ocpp
+# Not installed since 3.05, is it needed?
+#%attr(755,root,root) %{_bindir}/odyl
+%{_libdir}/%{name}/camlp4
+%{_mandir}/man*/*camlp4*
+%{_mandir}/man*/*ocpp*
-%if %{!?_without_emacs:1}%{?_without_emacs:0}
-%files emacs
+%files camlp4-doc-html
%defattr(644,root,root,755)
-%{_libdir}/emacs/site-lisp/*.el
-%endif
+%doc docs/html/camlp4*
-%files doc-ps
+%files compiler-objects
%defattr(644,root,root,755)
-%doc docs/*.ps.gz
+%{_libdir}/%{name}/compiler
+
+%files ocamldoc-devel
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/ocamldoc/*.cm*
+%{_libdir}/%{name}/ocamldoc/*.a
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}