X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=blobdiff_plain;f=ocaml.spec;h=f3b164023aba5b367e712284c15019a87bf63886;hp=c2dc99370425d4ff5e3198c052802ba7b76b22c4;hb=5972ad0c2dfcc7ada7daaa73a24ac9c18a1442c6;hpb=bf9b6da9bb37541598873a635e90754dfdb5aab1

diff --git a/ocaml.spec b/ocaml.spec
index c2dc993..f3b1640 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,67 +1,57 @@
 #
 # Conditional build:
-%bcond_without	emacs	# without emacs subpackage
-%bcond_without	x	# without X11 support 
-%bcond_without	tk	# without Tcl/Tk support
-%bcond_with	db3	# use db3 instead of db 4.x
-#
-# --without x11 implies --without tk
-%{!?with_x:%undefine	with_tk}
+%bcond_without	emacs		# emacs subpackage
+%bcond_without	x		# X11 support
+%bcond_without	ocaml_opt	# native, optimized compiler
+
+# ppc64, sparc64 and x32 variants not supported currently
+# alpha, hppa, ia64, mips removed since 4.00
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine	with_ocaml_opt
+%endif
 
-%define		p4ver	3.06
-%define		sver	3.08
+%define		sver	4.04
 
 Summary:	The Objective Caml compiler and programming environment
-Summary(pl):	Kompilator OCamla (Objective Caml) oraz ¶rodowisko programistyczne
+Summary(pl.UTF-8):	Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
 Name:		ocaml
-Version:	3.08.4
-Release:	2
+Version:	4.04.1
+Release:	5
 Epoch:		1
-License:	distributable
-Vendor:		Group of implementors <caml-light@inria.fr>
+License:	QPL v1.0 with linking exception (compiler), LGPL v2 with linking exception (library)
 Group:		Development/Languages
-Source0:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.gz
-# Source0-md5:	105d192896bf945b660c4fb1ee486f57
-Source1:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
-# Source1-md5:	0daee5643db6960682c1a7d84467885f
+Source0:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.xz
+# Source0-md5:	092139f2a256d1f3d2571f64ab475aa9
+Source1:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman-html.tar.gz
+# Source1-md5:	5c58a4fce99b20e02c3208ad956bcb9d
 Source2:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.gz
-# Source2-md5:	35a5d4318456c0982e72ee3f33364bf5
-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.4.tar.bz2
-# Source7-md5:	567bc681b4cc1cfcbbfb6fa5f012019b
-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:	49b68ec07ccd7ce45eb6bd3f3fdee140
-Patch0:		%{name}-build.patch
-Patch1:		%{name}-db3.patch
-Patch2:		%{name}-objinfo.patch
-# needs update for ocaml 3.08
-#Patch3:		%{name}-unused-var-warning.patch
-Patch4:		%{name}-tk85support.patch
+# Source2-md5:	a408f706789b9b84b0eb68da3db05f15
+Source3:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz
+# Source3-md5:	8c9df1da0e36a69817f43115fa87360c
+Source4:	https://github.com/mmottl/pure-fun/archive/v1.0.13/pure-fun-1.0.13.tar.gz
+# Source4-md5:	0a6ff033df78d0880fe4883ace025ebe
+# note: dead URL
+Source5:	http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
+# Source5-md5:	77fa1da7375dea1393cc0b6cd802d7e1
+Patch1:		%{name}-CFLAGS.patch
+Patch2:		%{name}-as_needed.patch
+Patch3:		x32.patch
 URL:		http://caml.inria.fr/
-%{?with_x:BuildRequires:	XFree86-devel}
-%{?with_db3:BuildRequires:	db3-devel}
-%{!?with_db3: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
+BuildRequires:	emacs
+BuildRequires:	emacs-common
 %endif
 Requires:	%{name}-runtime = %{epoch}:%{version}-%{release}
+Provides:	ocaml-bytes-devel
 Provides:	ocaml-ocamldoc
 Obsoletes:	ocaml-ocamldoc
+Obsoletes:	ocaml-bytes-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		specflags	-fno-strict-aliasing
+
 %description
 Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
@@ -71,107 +61,109 @@ and an optimizing native-code compiler), an interactive toplevel
 system, Lex&Yacc tools, a replay debugger, and a comprehensive
 library.
 
-%description -l pl
-OCaml (Objective Caml) jest funkcyjnym, obiektowo zorientowanym jêzykiem
-wysokiego poziomu z silnym typowaniem. Nale¿y do 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 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.
+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):	Dokumentacja dla OCamla w formacie HTML
+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
+%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 OCamla w formacie PostScript
+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
+%description doc-ps -l pl.UTF-8
 Dokumentacja dla OCamla w formacie PostScript.
 
 %package doc-info
 Summary:	Info documentation for OCaml
-Summary(pl):	Dokumentacja info dla OCamla
+Summary(pl.UTF-8):	Dokumentacja info dla OCamla
 Group:		Development/Tools
 
 %description doc-info
 Info documentation for OCaml.
 
-%description doc-info -l pl
+%description doc-info -l pl.UTF-8
 Dokumentacja info dla OCamla.
 
 %package emacs
 Summary:	Emacs mode for OCaml
-Summary(pl):	Tryb OCamla dla Emacsa
+Summary(pl.UTF-8):	Tryb OCamla dla Emacsa
 Group:		Development/Tools
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description emacs
 Emacs mode files for Objective Caml language.
 
-%description emacs -l pl
+%description emacs -l pl.UTF-8
 Pliki trybu OCamla dla Emacsa.
 
-%package runtime
-Summary:	Runtime system for OCaml
-Summary(pl):	¦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
-Pakiet ten zawiera binaria potrzebne do uruchamiania programów w
-OCamlu skompilowanych do bajtkodu: interpreter bajtkodu (ocamlrun) oraz
-podstawowe biblioteki linkowane dynamicznie.
-
-%package labltk-devel
-Summary:	LablTk library for OCaml
-Summary(pl):	Biblioteka LablTk dla OCamla
+%package x11graphics
+Summary:	X11 graphic output for OCaml
+Summary(pl.UTF-8):	Dostęp do X11 dla OCamla
 Group:		Development/Libraries
-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.
-
-%package labltk
-Summary:	Runtime for LablTk library
-Summary(pl):	¦rodowisko uruchomieniowe dla biblioteki LablTk
-Group:		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):	Dostêp do X11 dla OCamla
+Summary(pl.UTF-8):	Dostęp do X11 dla OCamla
 Group:		Development/Libraries
 Requires:	%{name}-x11graphics = %{epoch}:%{version}-%{release}
 
@@ -180,94 +172,30 @@ 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 mo¿liwo¶æ
+%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 x11graphics
-Summary:	X11 graphic output for OCaml
-Summary(pl):	Dostêp do X11 dla OCamla
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{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 mo¿liwo¶æ
-korzystania z interfejsu graficznego X11. Pakiet ten zawiera binaria
-potrzebne do uruchamiania programów u¿ywaj±cych x11graphics.
-
-%package camlp4
-Summary:	Objective Caml Preprocessor
-Summary(pl):	Preprocesor OCamla
-Group:		Development/Languages
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	camlp4 = %{epoch}:%{version}-%{release}
-Obsoletes:	camlp4
-
-%description camlp4
-Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml. It offers
-tools for syntax (grammars) and the ability to modify the concrete
-syntax of the language (quotations, syntax extensions).
-
-Camlp4 can parse normal Ocaml concrete syntax or any other
-user-definable syntax. As an example, an alternative syntax is
-provided, named revised, because it tries to fix some small problems
-of the normal syntax.
-
-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 Objective Caml compiler without
-preprocessing.
-
-%description camlp4 -l pl
-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):	Preprocesor OCamla - dokumentacja HTML 
-Group:		Development/Languages
-
-%description camlp4-doc-html
-Objective Caml Preprocessor - HTML documentation.
-
-%description camlp4-doc-html -l pl
-Preprocesor OCamla - dokumentacja HTML.
+niezbędne do tworzenia programów używających x11graphics.
 
 %package compiler-objects
 Summary:	Compiled parts of OCaml compiler
-Summary(pl):	Skompilowane czê¶ci kompilatora OCamla
+Summary(pl.UTF-8):	Skompilowane części kompilatora OCamla
 Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	ocaml-devel
 Provides:	ocaml-devel
+Obsoletes:	ocaml-devel
 
 %description compiler-objects
 This package contains *.cmi and *.cmo files being parts of OCaml
 compiler. They are needed to compile some programs.
 
-%description compiler-objects -l pl
-Pakiet ten zawiera pliki *.cmi oraz *.cmo bêd±ce czê¶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):	Pliki potrzebne do tworzenia programów u¿ywaj±cych ocamldoc
+Summary(pl.UTF-8):	Pliki potrzebne do tworzenia programów używających ocamldoc
 Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -275,27 +203,14 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 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 zamierzasz 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} = %{epoch}:%{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 s± przydatne przy odpluskwianiu programów u¿ytkownika
-z u¿yciem ocamldebug.
+%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):	Przyk³adowe kody ¼ród³owe w OCamlu
+Summary(pl.UTF-8):	Przykładowe kody źródłowe w OCamlu
 Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -303,58 +218,43 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 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 Funkcyjnych Struktur Danych
+%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 -a1 -a3 -a5  
+%setup -q -a1 -a3
 mkdir examples
-tar xjf %{SOURCE7} -C examples
-tar xzf %{SOURCE8} -C examples
-tar xzf %{SOURCE9}
+tar xzf %{SOURCE4} -C examples
+tar xzf %{SOURCE5} -C examples
 # order mess with docs somewhat
 mkdir -p docs/html
 mv htmlman docs/html/ocaml
 cp %{SOURCE2} docs/ocaml.ps.gz
-mv camlp4-%{p4ver}-manual.html docs/html/camlp4
-cp %{SOURCE4} docs/camlp4.ps.gz
-mv camlp4-%{p4ver}-tutorial.html docs/html/camlp4-tutorial
-cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-
-# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS)
-Makefiles=$(find . -type f -name Makefile\*)
-%{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles
-%{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles
-%{__sed} -i -e 's@^CCFLAGS[ \t]*=\(.*\)@override CCFLAGS += \1 $(CFLAGS)@' $Makefiles
-%{__sed} -i -e 's@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile
-%{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile
-
-%build 
+%patch3 -p1
+
+%build
 cp -f /usr/share/automake/config.sub config/gnu
 ./configure \
-        -cc "%{__cc}" \
+	-host %{_target_platform} \
+	-cc "%{__cc}" \
 	-bindir %{_bindir} \
 	-libdir %{_libdir}/%{name} \
 	-mandir %{_mandir}/man1 \
-	-host %{_host} \
-	%{!?with_tk:-no-tk} \
 	-with-pthread \
-	-x11lib /usr/X11R6/%{_lib}
+	-x11lib %{_libdir}
 
-%{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
-%{__make} -j1 -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
+%{__make} -j1 world bootstrap %{?with_ocaml_opt:opt.opt} \
+	CFLAGS="%{rpmcflags} -Wall -DUSE_INTERP_RESULT"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/site-lib
 
-%{__make} -j1 install \
+%{__make} install \
 	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
 	LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -365,42 +265,39 @@ cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
 EOF
 
 %if %{with emacs}
-%{__make} -j1 -C emacs DESTDIR=$RPM_BUILD_ROOT install \
-	EMACS="`if [ -x %{_bindir}/emacs ]; then echo emacs; \
-	        else echo xemacs; fi`" \
-	EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp"
+%{__make} -C emacs install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp" \
+	EMACS="emacs"
 %endif
 
-# symlink .opt versions of compilers (if present)
-# 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
-		ln -sf %{_bindir}/$f.opt $RPM_BUILD_ROOT%{_bindir}/$f
+# symlink .opt version of executable (if present)
+for f in ocamldoc ; do
+	if test -f $RPM_BUILD_ROOT%{_bindir}/${f}.opt; then
+		[ ! -f $RPM_BUILD_ROOT%{_bindir}/${f}.byte ] || exit 1 # drop rename if .opt/.byte already handled upstream
+		%{__mv} $RPM_BUILD_ROOT%{_bindir}/$f \
+			$RPM_BUILD_ROOT%{_bindir}/${f}.byte
+		ln -sf ${f}.opt $RPM_BUILD_ROOT%{_bindir}/$f
 	fi
 done
 
 # move includes to the proper place
-mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/caml $RPM_BUILD_ROOT%{_includedir}/caml
+%{__mv} $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
 
 # 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
+	cp $f/*.{cmi,cmo} $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f
+	%{?with_ocaml_opt:cp $f/*.{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
 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}
 
 # shutup checkfiles
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/man3
 
 # install info pages
 cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
@@ -408,41 +305,65 @@ cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post doc-info
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	doc-info -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun doc-info
-[ ! -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
-%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
+%postun	doc-info -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE Changes README Upgrading
-%attr(755,root,root) %{_bindir}/ocaml*
-%{!?_without_tk:%exclude %{_bindir}/ocamlbrowser}
-%exclude %{_bindir}/ocamlrun
-%attr(755,root,root) %{_bindir}/*labels
+%doc Changes LICENSE README.adoc
+%attr(755,root,root) %{_bindir}/addlabels
+%attr(755,root,root) %{_bindir}/ocaml
+%attr(755,root,root) %{_bindir}/ocamlc
+%attr(755,root,root) %{_bindir}/ocamlc.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlc.opt}
+%attr(755,root,root) %{_bindir}/ocamlcp
+%attr(755,root,root) %{_bindir}/ocamlcp.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlcp.opt}
+%attr(755,root,root) %{_bindir}/ocamldebug
+%attr(755,root,root) %{_bindir}/ocamldep
+%attr(755,root,root) %{_bindir}/ocamldep.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamldep.opt}
+%attr(755,root,root) %{_bindir}/ocamldoc
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamldoc.byte}
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamldoc.opt}
+%attr(755,root,root) %{_bindir}/ocamllex
+%attr(755,root,root) %{_bindir}/ocamllex.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamllex.opt}
+%attr(755,root,root) %{_bindir}/ocamlmklib
+%attr(755,root,root) %{_bindir}/ocamlmklib.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlmklib.opt}
+%attr(755,root,root) %{_bindir}/ocamlmktop
+%attr(755,root,root) %{_bindir}/ocamlmktop.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlmktop.opt}
+%attr(755,root,root) %{_bindir}/ocamlobjinfo
+%attr(755,root,root) %{_bindir}/ocamlobjinfo.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlobjinfo.opt}
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlopt}
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlopt.byte}
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlopt.opt}
+%attr(755,root,root) %{_bindir}/ocamloptp
+%attr(755,root,root) %{_bindir}/ocamloptp.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamloptp.opt}
+%attr(755,root,root) %{_bindir}/ocamlprof
+%attr(755,root,root) %{_bindir}/ocamlprof.byte
+%{?with_ocaml_opt:%attr(755,root,root) %{_bindir}/ocamlprof.opt}
+%attr(755,root,root) %{_bindir}/ocamlyacc
+%attr(755,root,root) %{_bindir}/scrapelabels
 %{_includedir}/caml
 %{_libdir}/%{name}/caml
+%{_libdir}/%{name}/compiler-libs
 %{_libdir}/%{name}/threads
 %dir %{_libdir}/%{name}/vmthreads
 %dir %{_libdir}/%{name}/vmthreads/*.cm*
 %dir %{_libdir}/%{name}/vmthreads/*.a
 %{_libdir}/%{name}/*.a
-%{_libdir}/%{name}/*.o
+%{?with_ocaml_opt:%{_libdir}/%{name}/*.o}
 %{_libdir}/%{name}/*.cm*
 %exclude %{_libdir}/%{name}/*graphics*
+%{_libdir}/%{name}/Makefile.config
 %{_libdir}/%{name}/ld.conf
 %{_libdir}/%{name}/camlheader
 %{_libdir}/%{name}/camlheader_ur
@@ -450,8 +371,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_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}/man1/*ocaml*
+%attr(755,root,root) %{_libdir}/%{name}/objinfo_helper
+%{_mandir}/man1/ocaml*
+%exclude %{_mandir}/man1/ocamlrun.1*
+
+%files runtime
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ocamlrun
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/VERSION
+%dir %{_libdir}/%{name}/site-lib
+%dir %{_libdir}/%{name}/stublibs
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dll*.so
+%exclude %{_libdir}/%{name}/stublibs/dllgraphics.so
+%{?with_ocaml_opt:%attr(755,root,root) %{_libdir}/%{name}/libasmrun_shared.so}
+%attr(755,root,root) %{_libdir}/%{name}/libcamlrun_shared.so
+%{_mandir}/man1/ocamlrun.1*
 
 %files lib-source
 %defattr(644,root,root,755)
@@ -459,80 +394,49 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.mli
 %{_libdir}/%{name}/*/*.mli
 
-%files examples
+%files doc-html
 %defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
-
-# they are poor, html is much better
-#%files manpages
-#%%{_mandir}/man3/*
+%doc docs/html/ocaml/*
 
-%files compiler-objects
+%files doc-ps
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/compiler
+%doc docs/*.ps.gz
 
-%files camlp4
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*camlp4*
-%attr(755,root,root) %{_bindir}/ocpp
-# Not installed since 3.05, is is needed?
-#%attr(755,root,root) %{_bindir}/odyl
-%{_libdir}/%{name}/camlp4
-%{_mandir}/man*/*camlp4*
-%{_mandir}/man*/*ocpp*
-
-%files camlp4-doc-html
+%files doc-info
 %defattr(644,root,root,755)
-%doc docs/html/camlp4*
+%{_infodir}/ocaml.info*
 
-%if %{with tk}
-%files labltk-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/labltk
-%attr(755,root,root) %{_bindir}/ocamlbrowser
-%dir %{_libdir}/%{name}/labltk
-%{_libdir}/%{name}/labltk/*.cm*
-%{_libdir}/%{name}/labltk/*.a
-%attr(755,root,root) %{_libdir}/%{name}/labltk/tkcompiler
-%{_examplesdir}/%{name}-labltk-%{version}
-
-%files labltk
+# they are poor, html is much better
+#%files manpages
+#%%{_mandir}/man3/*
+
+%if %{with emacs}
+%files emacs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlllabltk.so
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlltkanim.so
+%{_datadir}/emacs/site-lisp/*.el*
 %endif
 
 %if %{with x}
+%files x11graphics
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dllgraphics.so
+
 %files x11graphics-devel
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/graphics*.cm*
-%{_libdir}/%{name}/graphics.a
+%{?with_ocaml_opt:%{_libdir}/%{name}/graphics.a}
 %{_libdir}/%{name}/libgraphics.a
-
-%files x11graphics
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dllgraphics.so
 %endif
 
-%if %{with emacs}
-%files emacs
+%files compiler-objects
 %defattr(644,root,root,755)
-%{_datadir}/emacs/site-lisp/*.el*
-%endif
+%{_libdir}/%{name}/compiler
 
 %files ocamldoc-devel
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/ocamldoc/*.cm*
-%{_libdir}/%{name}/ocamldoc/*.a
-
-%files doc-html
-%defattr(644,root,root,755)
-%doc docs/html/ocaml/*
+%{?with_ocaml_opt:%{_libdir}/%{name}/ocamldoc/*.a}
 
-%files doc-ps
-%defattr(644,root,root,755)
-%doc docs/*.ps.gz
-
-%files doc-info
+%files examples
 %defattr(644,root,root,755)
-%{_infodir}/ocaml.info*
+%{_examplesdir}/%{name}-%{version}