#
# 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 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.12
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.3
-Release: 3
+Version: 4.12.0
+Release: 2
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: b1fc455aca6980e02e8cce8a3cbb4c81
-Source1: http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
-# Source1-md5: 0daee5643db6960682c1a7d84467885f
-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.oefai.at/~markus/ocaml_sources/pure-fun-1.0.4.tar.bz2
-# Source7-md5: 567bc681b4cc1cfcbbfb6fa5f012019b
-Source8: http://www.oefai.at/~markus/ocaml_sources/ds-contrib.tar.gz
-# Source8-md5: 77fa1da7375dea1393cc0b6cd802d7e1
-Patch0: %{name}-build.patch
-Patch1: %{name}-db3.patch
-Patch2: %{name}-objinfo.patch
-# needs update for ocaml 3.08
-#Patch3: %{name}-unused-var-warning.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}
-%if %{with emacs}
-BuildRequires: xemacs
-BuildRequires: xemacs-common
-BuildRequires: xemacs-fsf-compat-pkg
-%endif
+Source0: http://caml.inria.fr/distrib/ocaml-%{sver}/%{name}-%{version}.tar.xz
+# Source0-md5: 7343cd398d477001db2c3f2ac92e12ea
+Source1: http://caml.inria.fr/distrib/ocaml-%{sver}/%{name}-%{sver}-refman-html.tar.gz
+# Source1-md5: 1bda3d0a46328a985c817d551423e2c6
+Source3: http://caml.inria.fr/distrib/ocaml-%{sver}/%{name}-%{sver}-refman.info.tar.gz
+# Source3-md5: c808dbbe35a6cc5d14da6c3b2f175d2c
+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
+URL: https://www.ocaml.org/
Requires: %{name}-runtime = %{epoch}:%{version}-%{release}
+Provides: ocaml-bytes-devel
Provides: ocaml-ocamldoc
+Obsoletes: ocaml-bytes-devel
+Obsoletes: ocaml-doc-ps < 4.12
+Obsoletes: ocaml-emacs < 4.12
Obsoletes: ocaml-ocamldoc
+Obsoletes: ocaml-x11graphics < 4.12
+Obsoletes: ocaml-x11graphics-devel < 4.12
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.
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.
-
-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 doc-ps
-Summary: PostScript documentation for OCaml
-Summary(pl): Dokumentacja dla OCamla w formacie PostScript
-Group: Development/Tools
-
-%description doc-ps
-PostScript documentation for OCaml. HTML documentation is in main package.
-
-%description doc-ps -l pl
-Dokumentacja dla OCamla w formacie PostScript. Dokumentacja HTML jest
-w g³ównym pakiecie.
+%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.
-%package emacs
-Summary: Emacs mode for OCaml
-Summary(pl): 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
-Pliki trybu OCamla dla Emacsa.
+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): ¦rodowisko uruchomieniowe dla OCamla
+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
-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
-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 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.
-%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 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.
-
-%package x11graphics-devel
-Summary: X11 graphic output for OCaml
-Summary(pl): Dostêp do X11 dla OCamla
-Group: Development/Libraries
-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 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
+%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 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 lib-source
+This sources come helpful during debugging of user programs with
+ocamldebug.
-%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.
+%description lib-source -l pl.UTF-8
+Źródła te są przydatne przy odpluskwianiu programów użytkownika z
+użyciem ocamldebug.
-%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 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-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 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}
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}
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
-autorstwa Okasaki'ego, napisane w OCamlu, wraz z dodatkami.
+%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 %{SOURCE4} -C examples
+tar xzf %{SOURCE5} -C examples
# 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
-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
%build
-cp -f /usr/share/automake/config.sub config/gnu
-./configure \
- -cc "%{__cc} %{rpmcflags}" \
- -bindir %{_bindir} \
- -libdir %{_libdir}/%{name} \
- -mandir %{_mandir}/man1 \
- -host %{_host} \
- %{!?with_tk:-no-tk} \
- -with-pthread \
- -x11lib /usr/X11R6/%{_lib}
-
-%{__make} world bootstrap opt.opt
-%{__make} -C tools objinfo
+%configure \
+ AS=%{__as} \
+ ASPP="%{__cc} -c" \
+ --libdir=%{_libdir}/ocaml \
+ %{!?with_ocaml_opt:--disable-native-compiler}
+
+%{__make} world
+%{__make} bootstrap
+%if %{with ocaml_opt}
+%{__make} opt
+%{__make} opt.opt
+%endif
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_examplesdir}/%{name}-{labltk-,}%{version}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/site-lib
%{__make} install \
- BINDIR=$RPM_BUILD_ROOT%{_bindir} \
- LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
- MANDIR=$RPM_BUILD_ROOT%{_mandir}
+ DESTDIR=$RPM_BUILD_ROOT
cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
%{_libdir}/%{name}/stublibs
%{_libdir}/%{name}
EOF
-%if %{with emacs}
-%{__make} -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"
-%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
- 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}/ocaml/caml $RPM_BUILD_ROOT%{_includedir}/caml
# but leave compatibility symlink
-ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/%{name}/caml
+ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/ocaml/caml
# compiled sources of compiler, needed by some programs
-for f in {asm,byte}comp parsing typing utils ; do
+for f in %{?with_ocaml_opt:asmcomp} bytecomp 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}
%clean
rm -rf $RPM_BUILD_ROOT
-%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
+%post doc-info -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun doc-info -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
%files
%defattr(644,root,root,755)
-%doc LICENSE Changes README Upgrading
-%doc docs/html/ocaml
-%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}/ocamlcmt
+%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.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}/camlheaderd
+%{_libdir}/%{name}/camlheaderi
%{_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}/man1/*ocaml*
+%{_mandir}/man1/ocaml*
+%exclude %{_mandir}/man1/ocamlrun.1*
+
+%files runtime
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ocamlrun
+%attr(755,root,root) %{_bindir}/ocamlrund
+%attr(755,root,root) %{_bindir}/ocamlruni
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/site-lib
+%dir %{_libdir}/%{name}/stublibs
+%{_libdir}/%{name}/eventlog_metadata
+%attr(755,root,root) %{_libdir}/%{name}/stublibs/dll*.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)
%{_libdir}/%{name}/*.mli
%{_libdir}/%{name}/*/*.mli
-%files examples
+%files doc-html
%defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
+%doc docs/html/ocaml/*
-# they are poor, html is much better
-#%files manpages
-#%%{_mandir}/man3/*
+%files doc-info
+%defattr(644,root,root,755)
+%{_infodir}/ocaml.info*
%files compiler-objects
%defattr(644,root,root,755)
%{_libdir}/%{name}/compiler
-%files camlp4
-%defattr(644,root,root,755)
-%doc docs/html/camlp4*
-%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*
-
-%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
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlllabltk.so
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlltkanim.so
-%endif
-
-%if %{with x}
-%files x11graphics-devel
-%defattr(644,root,root,755)
-%{_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}/stublibs/dllgraphics.so
-%endif
-
-%if %{with emacs}
-%files emacs
-%defattr(644,root,root,755)
-%{_datadir}/emacs/site-lisp/*.el*
-%endif
-
%files ocamldoc-devel
%defattr(644,root,root,755)
%{_libdir}/%{name}/ocamldoc/*.cm*
-%{_libdir}/%{name}/ocamldoc/*.a
+%{?with_ocaml_opt:%{_libdir}/%{name}/ocamldoc/*.a}
-%files doc-ps
+%files examples
%defattr(644,root,root,755)
-%doc docs/*.ps.gz
+%{_examplesdir}/%{name}-%{version}