diff --git a/ocaml-4.11-refman.pdf b/ocaml-4.11-refman.pdf deleted file mode 100644 index 17ac293..0000000 Binary files a/ocaml-4.11-refman.pdf and /dev/null differ diff --git a/ocaml-4.14-refman.pdf b/ocaml-4.14-refman.pdf new file mode 100644 index 0000000..52c025c Binary files /dev/null and b/ocaml-4.14-refman.pdf differ diff --git a/ocaml.spec b/ocaml.spec index e824d5f..9210dff 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -1,14 +1,14 @@ %define majorminor %(echo %version | cut -d. -f 1-2) Name: ocaml -Version: 4.11.1 -Release: 5mamba +Version: 4.14.1 +Release: 1mamba Summary: The OCaml compiler and programming environment Group: Applications/Development Vendor: openmamba Distribution: openmamba -Packager: Davide Madrisan -URL: http://www.ocaml.org +Packager: Silvan Calarco +URL: https://www.ocaml.org/ Source0: http://caml.inria.fr/pub/distrib/ocaml-%{majorminor}/ocaml-%{version}.tar.xz Source1: http://caml.inria.fr/pub/distrib/ocaml-%{majorminor}/ocaml-%{majorminor}-refman.pdf Source2: http://caml.inria.fr/pub/distrib/ocaml-%{majorminor}/ocaml-%{majorminor}-refman-html.tar.gz @@ -16,7 +16,6 @@ Source3: http://caml.inria.fr/pub/distrib/ocaml-%{majorminor}/ocaml-%{majo License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: emacs-nox #BuildRequires: ocaml-runtime >= %{?epoch:%epoch:}%{version} @@ -31,7 +30,6 @@ Requires: ocaml-runtime = %{?epoch:%epoch:}%{version}-%{release} Provides: ocaml(compiler) = %{version} %global __ocaml_requires_opts -c -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte' %global __ocaml_provides_opts -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte' -BuildRoot: %{_tmppath}/%{name}-%{version}-root # FIXME: # @@ -164,8 +162,8 @@ Summary: Documentation for OCaml Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires(post): %{__install_info} Requires(preun): %{__install_info} -Provides: %{name}-manual = %{?epoch:%epoch:}%{version}-%{release} -Obsoletes: %{name}-manual +Provides: ocaml-manual +Obsoletes: ocaml-manual < 4.14.1 %description docs OCaml is a general-purpose programming language, designed with program safety and reliability in mind. @@ -177,12 +175,13 @@ This package contains documentation in PDF and HTML format as well as man pages %global __ocaml_provides_opts -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte' %prep -%setup -q -a2 -a3 -D -T -:<< _EOF +%setup -q -a2 -a3 +#-D -T +#:<< _EOF cp %{S:1} refman.pdf %build -:<< _EOF +#:<< _EOF %configure \ --libdir=%{_libdir}/ocaml \ --with-pic @@ -222,20 +221,17 @@ cp ocaml*.gz %{buildroot}%{_infodir} %post docs %install_info %{name}.info -exit 0 +: %preun docs if [ $1 -eq 0 ]; then %uninstall_info %{name}.info fi -exit 0 +: %files %defattr(-,root,root) %{_bindir}/ocaml -#%{_bindir}/ocamlbuild -#%{_bindir}/ocamlbuild.byte -#%{_bindir}/ocamlbuild.native %{_bindir}/ocamlc %{_bindir}/ocamlc.byte %{_bindir}/ocamlc.opt @@ -275,7 +271,7 @@ exit 0 %{_libdir}/ocaml/camlheader %{_libdir}/ocaml/camlheader_ur %{_libdir}/ocaml/expunge -%{_libdir}/ocaml/extract_crc +#%{_libdir}/ocaml/extract_crc %{_libdir}/ocaml/eventlog_metadata %{_libdir}/ocaml/ld.conf %{_libdir}/ocaml/Makefile.config @@ -287,9 +283,7 @@ exit 0 %{_libdir}/ocaml/*.mli %{_libdir}/ocaml/libcamlrun_shared.so %{_libdir}/ocaml/libasmrun_shared.so -%{_libdir}/ocaml/objinfo_helper -#%{_libdir}/ocaml/vmthreads/*.a -#%{_libdir}/ocaml/vmthreads/*.mli +#%{_libdir}/ocaml/objinfo_helper %{_libdir}/ocaml/threads/*.a %{_libdir}/ocaml/threads/*.cmx %{_libdir}/ocaml/threads/*.cmxa @@ -314,7 +308,7 @@ exit 0 %{_bindir}/ocamlrund %{_bindir}/ocamlruni %dir %{_libdir}/ocaml -%{_libdir}/ocaml/VERSION +#%{_libdir}/ocaml/VERSION %{_libdir}/ocaml/*.cmo %{_libdir}/ocaml/*.cmi %{_libdir}/ocaml/*.cma @@ -324,9 +318,9 @@ exit 0 %{_libdir}/ocaml/stublibs/dllcamlstr.so %{_libdir}/ocaml/stublibs/dllthreads.so %{_libdir}/ocaml/stublibs/dllunix.so -%ifarch x86_64 aarch64 -%{_libdir}/ocaml/stublibs/dllraw_spacetime_lib.so -%endif +#%ifarch x86_64 aarch64 +#%{_libdir}/ocaml/stublibs/dllraw_spacetime_lib.so +#%endif %dir %{_libdir}/ocaml/threads %{_libdir}/ocaml/threads/*.cmi %{_libdir}/ocaml/threads/*.cma @@ -335,7 +329,7 @@ exit 0 %{_libdir}/ocaml/compiler-libs/*.cmo %{_libdir}/ocaml/compiler-libs/*.cma %{_mandir}/man1/ocamlrun.* -%doc LICENSE +#%doc LICENSE %files source %defattr(-,root,root) @@ -374,10 +368,16 @@ exit 0 %defattr(-,root,root) %{_infodir}/* %{_mandir}/man3/* +%dir %{_datadir}/doc/ocaml +%{_datadir}/doc/ocaml/* + #%doc Changes #%doc refman.pdf htmlman %changelog +* Sat Jul 01 2023 Silvan Calarco 4.14.1-1mamba +- update to 4.14.1 + * Mon Apr 26 2021 Silvan Calarco 4.11.1-5mamba - workaround ocaml-runtime requiring ocaml-compiler-libs by moving needed files into ocaml-runtime