labtk-devel: require libtcl-devel and libtk-devel instead of libtcl85-devel and libtk85-devel [release 4.01.0-2mamba;Tue Jan 21 2014]

README.md

@@ -3,5 +3,25 @@
 OCaml is a general-purpose programming language, designed with program safety and reliability in mind.
 It is very expressive, yet easy to learn and use.
 OCaml supports functional, imperative, and object-oriented programming styles.
+
 It has been developed and distributed by INRIA, France's national research institute for computer science, since 1985.
 
+This package provides in particular the following tools:
+ * ocamlc: the OCaml batch compiler,
+ * ocamlopt: the OCaml high-performance native-code compiler,
+ * ocamldep: the dependency generator (in a format suitable for the make utility),
+ * ocaml: the interactive (command-line) toplevel system,
+ * ocamlmktop: builds OCaml toplevels that contain user code preloaded at start-up,
+ * ocamllex: the OCaml lexical analyser, very close to lex,
+ * ocamlyacc: the OCaml parser generator, in the style yacc.
+ * ocamldebug: the OCaml source-level replay debugger,
+ * ocamlprof: the OCaml profiling tool,
+     for programs compiled in profiling mode by using either
+     ocamlcp: the front-end to the ocamlc compiler
+      or
+     ocamloptp: the front-end to the ocamlopt compiler,
+ * ocamlbuild:
+     automates the compilation of most OCaml projects with minimal user intervention,
+ * ocamlmklib: a tool for building mixed C/OCaml libraries
+ * ocamlobjinfo: a tool for displaying informations on files
+

ocaml.spec

@@ -1,8 +1,8 @@
 %define majorminor %(echo %version | cut -d. -f 1-2)
 
 Name:          ocaml
-Version:       4.00.1
+Version:       4.01.0
-Release:       3mamba
+Release:       2mamba
 Summary:       The OCaml compiler and programming environment
 Group:         Applications/Development
 Vendor:        openmamba
@@ -22,15 +22,79 @@ BuildRequires: libtk-devel
 BuildRequires: libX11-devel
 ## AUTOBUILDREQ-END
 BuildRequires: emacs-nox
+BuildRequires: libgdbm-devel
+Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      gcc
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
+# FIXME:
+#
+# BFD library not found, 'objinfo' will be unable to display info on .cmxs files
+#  ./hasgot -i bfd.h && \
+#  ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
+
 %description
 OCaml is a general-purpose programming language, designed with program safety and reliability in mind.
 It is very expressive, yet easy to learn and use.
 OCaml supports functional, imperative, and object-oriented programming styles.
+
 It has been developed and distributed by INRIA, France's national research institute for computer science, since 1985.
 
+This package provides in particular the following tools:
+ * ocamlc: the OCaml batch compiler,
+ * ocamlopt: the OCaml high-performance native-code compiler, 
+ * ocamldep: the dependency generator (in a format suitable for the make utility),
+ * ocaml: the interactive (command-line) toplevel system,
+ * ocamlmktop: builds OCaml toplevels that contain user code preloaded at start-up,
+ * ocamllex: the OCaml lexical analyser, very close to lex,
+ * ocamlyacc: the OCaml parser generator, in the style yacc.
+ * ocamldebug: the OCaml source-level replay debugger,
+ * ocamlprof: the OCaml profiling tool,
+     for programs compiled in profiling mode by using either
+     ocamlcp: the front-end to the ocamlc compiler
+      or
+     ocamloptp: the front-end to the ocamlopt compiler,
+ * ocamlbuild:
+     automates the compilation of most OCaml projects with minimal user intervention,
+ * ocamlmklib: a tool for building mixed C/OCaml libraries
+ * ocamlobjinfo: a tool for displaying informations on files
+
+%package runtime
+Group:         Applications/Development
+Summary:       OCaml runtime environment
+
+%description runtime
+This package contains the runtime environment needed to run OCaml bytecode.
+In particular the OCaml bytecode interpreter: ocamlrun.
+
+%package camlp4
+Summary:       Pre-Processor-Pretty-Printer for OCaml
+Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
+
+%description camlp4
+Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source file and printing some result on standard output.
+This package contains the runtime files.
+
+%package camlp4-devel
+Summary:       Pre-Processor-Pretty-Printer for OCaml
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-camlp4 = %{?epoch:%epoch:}%{version}-%{release}
+
+%description camlp4-devel
+Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source file and printing some result on standard output.
+RPM_OPT_FLAGS=`$RPM_OPT_FLAGS | sed "s|-fomit-frame-pointer||"
+export RPM_OPT_FLAGS
+
+This package contains the development files.
+
+%package x11
+Summary:       X11 support for OCaml
+Requires:      %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      libX11-devel
+
+%description x11
+X11 support for OCaml.
+
 %package labltk
 Group:         Applications/Development
 Summary:       Tk bindings for OCaml
@@ -63,6 +127,14 @@ Requires:      emacs-nox
 %description emacs
 Emacs mode for OCaml.
 
+%package ocamldoc
+Group:         Applications/Development
+Summary:       Documentation generator for OCaml
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description ocamldoc
+Documentation generator for OCaml.
+
 %package docs
 Group:         Documentation
 Summary:       Documentation for OCaml
@@ -77,20 +149,22 @@ OCaml is a general-purpose programming language, designed with program safety an
 This package contains documentation in PDF and HTML format as well as man pages and info files.
 
 %prep
-%setup -q
 %setup -q -a2 -a3
 cp %{S:1} refman.pdf
 
 %build
 ./configure \
    -host %{_host} \
-   -cc "gcc ${RPM_OPT_FLAGS/-fomit-frame-pointer/}" \
+%ifnarch arm
+   -cc "gcc ${RPM_OPT_FLAGS}" \
+%endif
    -bindir %{_bindir} \
    -libdir %{_libdir}/ocaml \
    -mandir %{_mandir}/man1
 
-%make -j1 world opt opt.opt
+%make -j1 world.opt
 %make -j1 -C emacs ocamltags
+%make -j1 -C ocamldoc all
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -111,21 +185,16 @@ mkdir -p %{buildroot}%{_infodir}
 cd infoman
 cp ocaml*.gz %{buildroot}%{_infodir}
 
-#install -m 0755 ocamlbyteinfo %{buildroot}%{_bindir}
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %post docs
-%install_info %{_infodir}/%{name}.info \
+%install_info %{name}.info
-    --entry="* ocaml: (ocaml).   The OCaml compiler and programming environment" \
-    --section="Programming Languages" \
-    %{_infodir}/dir 2>/dev/null
 exit 0
 
 %preun docs
 if [ $1 -eq 0 ]; then
-   %uninstall_info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null
+   %uninstall_info %{name}.info
 fi
 exit 0
 
@@ -152,8 +221,6 @@ exit 0
 %{_bindir}/ocamlprof
 %{_bindir}/ocamlyacc
 #
-%{_bindir}/ocamlrun
-#
 %{_libdir}/ocaml/camlheader
 %{_libdir}/ocaml/camlheader_ur
 %{_libdir}/ocaml/expunge
@@ -161,35 +228,101 @@ exit 0
 %{_libdir}/ocaml/ld.conf
 %{_libdir}/ocaml/Makefile.config
 %{_libdir}/ocaml/*.a
-%{_libdir}/ocaml/*.cma
-%{_libdir}/ocaml/*.cmi
-%{_libdir}/ocaml/*.cmo
 %{_libdir}/ocaml/*.cmxs
 %{_libdir}/ocaml/*.cmxa
 %{_libdir}/ocaml/*.cmx
 %{_libdir}/ocaml/*.o
 %{_libdir}/ocaml/*.ml
 %{_libdir}/ocaml/*.mli
+%exclude %{_libdir}/ocaml/graphicsX11.mli
 %{_libdir}/ocaml/libcamlrun_shared.so
 %{_libdir}/ocaml/objinfo_helper
 %{_libdir}/ocaml/compiler-libs/
-%{_libdir}/ocaml/vmthreads/
+%{_libdir}/ocaml/vmthreads/*.a
-%{_libdir}/ocaml/threads/
+%{_libdir}/ocaml/vmthreads/*.mli
+%{_libdir}/ocaml/threads/*.a
+%{_libdir}/ocaml/threads/*.cmx
+%{_libdir}/ocaml/threads/*.cmxa
 %{_libdir}/ocaml/caml
 %{_libdir}/ocaml/ocamlbuild
-%dir %{_libdir}/ocaml/stublibs
+%{_mandir}/man1/ocaml.*
-%{_libdir}/ocaml/stublibs/dll*.so
+%{_mandir}/man1/ocamlbuild.*
+%{_mandir}/man1/ocamlc.*
+%{_mandir}/man1/ocamlcp.*
+%{_mandir}/man1/ocamldebug.*
+%{_mandir}/man1/ocamldep.*
+%{_mandir}/man1/ocamllex.*
+%{_mandir}/man1/ocamlmktop.*
+%{_mandir}/man1/ocamlopt.*
+%{_mandir}/man1/ocamloptp.*
+%{_mandir}/man1/ocamlprof.*
+%{_mandir}/man1/ocamlyacc.*
+%doc LICENSE README Changes
+
+%files runtime
+%defattr(-,root,root)
+%{_bindir}/ocamlrun
 %{_libdir}/ocaml/VERSION
-# camlp4
+%{_libdir}/ocaml/*.cmo
-%{_libdir}/ocaml/camlp4/
+%{_libdir}/ocaml/*.cmi
+%exclude %{_libdir}/ocaml/graphicsX11.cmi
+%{_libdir}/ocaml/*.cma
+%dir %{_libdir}/ocaml/stublibs
+%{_libdir}/ocaml/stublibs/dllbigarray.so
+%{_libdir}/ocaml/stublibs/dllcamlstr.so
+%{_libdir}/ocaml/stublibs/dllgraphics.so
+%{_libdir}/ocaml/stublibs/dllnums.so
+%{_libdir}/ocaml/stublibs/dllthreads.so
+%{_libdir}/ocaml/stublibs/dllunix.so
+%{_libdir}/ocaml/stublibs/dllvmthreads.so
+%dir %{_libdir}/ocaml/threads
+%{_libdir}/ocaml/threads/*.cmi
+%{_libdir}/ocaml/threads/*.cma
+%dir %{_libdir}/ocaml/vmthreads
+%{_libdir}/ocaml/vmthreads/*.cmi
+%{_libdir}/ocaml/vmthreads/*.cma
+%{_mandir}/man1/ocamlrun.*
+
+%files camlp4
+%defattr(-,root,root)
+%dir %{_libdir}/ocaml/camlp4
+%{_libdir}/ocaml/camlp4/*.cma
+%{_libdir}/ocaml/camlp4/*.cmi
+%{_libdir}/ocaml/camlp4/*.cmo
+%dir %{_libdir}/ocaml/camlp4/Camlp4Filters
+%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmi
+%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmo
+%dir %{_libdir}/ocaml/camlp4/Camlp4Parsers
+%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmo
+%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmi
+%dir %{_libdir}/ocaml/camlp4/Camlp4Printers
+%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmi
+%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmo
+%dir %{_libdir}/ocaml/camlp4/Camlp4Top
+%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmi
+%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmo
+
+%files camlp4-devel
+%defattr(-,root,root)
 %{_bindir}/camlp4*
 %{_bindir}/mkcamlp4
-%{_mandir}/man1/*
+%{_libdir}/ocaml/camlp4/*.a
-# ocamldoc
+%{_libdir}/ocaml/camlp4/*.cmx
-%{_bindir}/ocamldoc*
+%{_libdir}/ocaml/camlp4/*.cmxa
-%{_libdir}/ocaml/ocamldoc
+%{_libdir}/ocaml/camlp4/*.o
-#
+%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmx
-%doc LICENSE README Changes
+%{_libdir}/ocaml/camlp4/Camlp4Filters/*.o
+%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.cmx
+%{_libdir}/ocaml/camlp4/Camlp4Parsers/*.o
+%{_libdir}/ocaml/camlp4/Camlp4Printers/*.cmx
+%{_libdir}/ocaml/camlp4/Camlp4Printers/*.o
+%{_libdir}/ocaml/camlp4/Camlp4Top/*.cmx
+%{_libdir}/ocaml/camlp4/Camlp4Top/*.o
+
+%files x11
+%defattr(-,root,root)
+%{_libdir}/ocaml/graphicsX11.cmi
+%{_libdir}/ocaml/graphicsX11.mli
 
 %files labltk
 %defattr(-,root,root)
@@ -220,6 +353,12 @@ exit 0
 %{_bindir}/ocamltags
 %doc emacs/README
 
+%files ocamldoc
+%defattr(-,root,root)
+%{_bindir}/ocamldoc*
+%{_libdir}/ocaml/ocamldoc
+%{_mandir}/man1/ocamldoc.*
+
 %files docs
 %defattr(-,root,root)
 %{_infodir}/*
@@ -227,6 +366,16 @@ exit 0
 %doc refman.pdf htmlman
 
 %changelog
+* Tue Jan 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 4.01.0-2mamba
+- labtk-devel: require libtcl-devel and libtk-devel instead of libtcl85-devel and libtk85-devel
+
+* Sun Nov 24 2013 Automatic Build System <autodist@mambasoft.it> 4.01.0-1mamba
+- automatic version update by autodist
+
+* Tue Jul 09 2013 Davide Madrisan <davide.madrisan@gmail.com> 4.00.1-4mamba
+- new subpackage runtime, camlp4, camlp4-devel, x11, and ocamldoc
+- build requires libtcl85-devel and libtk85-devel
+
 * Mon Jul 01 2013 Automatic Build System <autodist@mambasoft.it> 4.00.1-3mamba
 - pass -host option to configure to build for arm generic and fix rpi target