Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2011-11-02 15:45:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2011-09-23 02:14:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2011-11-02 15:45:48.000000000 +0100 @@ -1,0 +2,45 @@ +Fri Jul 22 00:23:13 UTC 2011 - [email protected] + +- Unremove code block regarding removing -fomit-frame-pointer within RPM_OPT_FLAGS for ix86 architectures + +------------------------------------------------------------------- +Thu Jul 21 21:22:02 UTC 2011 - [email protected] + +- Enable optimizations (Fedora does this) +- More cleanup done + +------------------------------------------------------------------- +Thu Jul 21 15:24:38 UTC 2011 - [email protected] + +- Clean up spec file +- Remove ocaml-3.12-fix-size-directive.patch + +------------------------------------------------------------------- +Tue Jul 5 14:36:05 UTC 2011 - [email protected] + +- New upstream version 3.12.1, providing many bugfixes. +- ocaml-3.12-fix-size-directive.patch is no longer needed. + +------------------------------------------------------------------- +Sun Jun 19 03:48:56 UTC 2011 - [email protected] + +- Add compiler library packages + +------------------------------------------------------------------- +Sun Jun 19 01:01:42 UTC 2011 - [email protected] + +- Obsolete old "camlp4" package + +------------------------------------------------------------------- +Fri Jun 17 03:25:15 UTC 2011 - [email protected] + +- Split (and rename) camlp4 package. Add provide for consistency. +- Decomment some stuff. + +------------------------------------------------------------------- +Fri May 27 21:57:20 UTC 2011 - [email protected] + +- Make the spec work with older versions of RPM +- Split some parts of packages for devel-ness + +------------------------------------------------------------------- Old: ---- ocaml-3.12-fix-size-directive.patch ocaml-3.12.0.tar.bz2 New: ---- ocaml-3.12.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.pXth3n/_old 2011-11-02 15:45:50.000000000 +0100 +++ /var/tmp/diff_new_pack.pXth3n/_new 2011-11-02 15:45:50.000000000 +0100 @@ -2,6 +2,8 @@ # spec file for package ocaml # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail.com> +# Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail.com> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +21,10 @@ Name: ocaml -BuildRequires: emacs-nox fdupes gdbm-devel ncurses-devel tk-devel -License: GPLv2 and QPL +License: QPL and (LGPLv2+ with Exceptions) Group: Development/Languages/Other -AutoReqProv: on -Version: 3.12.0 -Release: 9 +Version: 3.12.1 +Release: 3 %define doc_version 3.12 %ifarch s390 s390x %define do_opt 0 @@ -44,19 +44,29 @@ Patch6: ocaml-3.08.3.patch Patch7: ocaml-3.09-emacs_localcompile.patch Patch8: ocaml-3.09-rpmoptflags.patch -# PATCH-FIX-UPSTREAM ocaml-3.12-fix-size-directive.patch [email protected] -- PR# 5237: fix incorrect .size directives -Patch9: ocaml-3.12-fix-size-directive.patch Url: http://caml.inria.fr/ Summary: The Objective Caml Compiler and Programming Environment BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq + +BuildRequires: emacs-nox +BuildRequires: fdupes +BuildRequires: gdbm-devel +BuildRequires: ncurses-devel +BuildRequires: tk-devel +# This gets ocamlobjinfo to work with .cmxs files +BuildRequires: binutils-devel +Provides: ocaml(compiler) = %{version} ExcludeArch: ppc64 # Fedora provides Provides: ocaml(runtime) = %{version} Provides: ocaml-runtime = %{version} -# otherwise rpm cannot find them with find_provides/find_requires from -# ocaml.attr +%if 0%{?suse_version} <= 1140 +%define _use_internal_dependency_generator 1 +%endif + +# This ensures that the find_provides/find_requires calls ocamlobjinfo correctly. %global __ocaml_requires_opts -c -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo" %global __ocaml_provides_opts -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo" @@ -69,58 +79,106 @@ system, Lex&Yacc tools, a replay debugger, and a comprehensive library. -%package devel -License: GPLv2+ ; QPL .. +%package runtime +License: QPL Summary: The Objective Caml Compiler and Programming Environment Group: Development/Languages/Other -# Fedora provides -Provides: ocaml(compiler) = %{version} -AutoReqProv: on +Provides: ocaml(runtime) = %{version} -%description devel +%description runtime Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. -This package comprises two batch compilers (a fast bytecode compiler -and an optimizing native-code compiler), an interactive top level -system, Lex&Yacc tools, a replay debugger, and a comprehensive library. - +This package contains the runtime environment needed to run Objective +Caml bytecode. -%package -n labltk -License: GPLv2+ ; QPL .. +%package source +License: QPL and (LGPLv2+ with Exceptions) Group: Development/Languages/Other +Summary: Source code for Objective Caml libraries +Requires: ocaml = %{version}-%{release} + +%description source +Source code for Objective Caml libraries. + + +%package x11 +License: LGPLv2 with static linking exception +Group: System/Libraries +Summary: X11 support for Objective Caml +Requires: ocaml-runtime = %{version}-%{release} + +%description x11 +X11 support for Objective Caml. + + + +%package labltk +License: LGPLv2 with static linking exception +Group: System/Libraries Summary: The Objective Caml Compiler and Programming Environment +Requires: ocaml(runtime) = %{version}-%{release} Requires: ocaml = %{version}-%{release} -%description -n labltk -Objective Caml is a high-level, strongly-typed, functional and -object-oriented programming language from the ML family of languages. +%description labltk +Labltk is a library for interfacing Objective Caml with the scripting +language Tcl/Tk. -This package comprises two batch compilers (a fast bytecode compiler -and an optimizing native-code compiler), an interactive top level -system, Lex&Yacc tools, a replay debugger, and a comprehensive library. +This package contains the runtime files. -%package -n camlp4 -License: GPLv2+ ; QPL .. -Group: Development/Languages/Other -Summary: The Objective Caml compiler and programming environment +%package labltk-devel +License: LGPLv2 with static linking exception +Group: Development/Libraries/Other +Summary: Development files for labltk Requires: ocaml = %{version}-%{release} +Requires: %{name}-labltk = %{version}-%{release} +Requires: xorg-x11-libX11-devel +Requires: tcl-devel +Requires: tk-devel + +%description labltk-devel +Labltk is a library for interfacing Objective Caml with the scripting +language Tcl/Tk. + +This package contains the development files. It includes the ocaml +browser for code editing and library browsing. -%description -n camlp4 -Objective Caml is a high-level, strongly-typed, functional and -object-oriented programming language from the ML family of languages. -This package comprises two batch compilers (a fast bytecode compiler -and an optimizing native-code compiler), an interactive toplevel -system, Lex&Yacc tools, a replay debugger, and a comprehensive library. +%package camlp4 +License: LGPLv2 with static-linking exception +Group: Development/Languages/Other +Summary: Pre-Processor-Pretty-Printer for Objective Caml +Requires: ocaml-runtime = %{version}-%{release} + +%description camlp4 +Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a +source file and printing some result on standard output. + +This package contains the runtime files. + + +%package camlp4-devel +License: LGPLv2 with static-linking exception +Group: Development/Languages/Other +Summary: Pre-Processor-Pretty-Printer for Objective Caml +Requires: ocaml = %{version}-%{release} +Requires: %{name}-camlp4 = %{version}-%{release} +Provides: camlp4 = %{version} +Obsoletes: camlp4 < %{version} + +%description camlp4-devel +Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a +source file and printing some result on standard output. + +This package contains the development files. %package ocamldoc -License: GPLv2+ ; QPL .. +License: QPL Group: Development/Languages/Other Summary: The Objective Caml Compiler and Programming Environment Requires: ocaml = %{version}-%{release} @@ -129,26 +187,23 @@ Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. -This package comprises two batch compilers (a fast bytecode compiler -and an optimizing native-code compiler), an interactive top level -system, Lex&Yacc tools, a replay debugger, and a comprehensive library. +This package contains a documentation generator for Objective Caml. %package emacs -License: GPLv2+ ; QPL .. +License: GPLv2+ Group: Development/Languages/Other Summary: The Objective Caml Compiler and Programming Environment Requires: ocaml = %{version}-%{release} Requires: emacs +Provides: caml-mode %description emacs Objective Caml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. -This package comprises two batch compilers (a fast bytecode compiler -and an optimizing native-code compiler), an interactive top level -system, Lex&Yacc tools, a replay debugger, and a comprehensive library. +This package provides caml-mode for emacs @@ -166,6 +221,30 @@ and an optimizing native-code compiler), an interactive top level system, Lex&Yacc tools, a replay debugger, and a comprehensive library. +%package compiler-libs +License: QPL +Group: Development/Libraries/Other +Summary: Libraries used internal to the OCaml Compiler +Requires: ocaml = %{version}-%{release} + +%description compiler-libs +Objective Caml is a high-level, strongly-typed, functional and +object-oriented programming language from the ML family of languages. + +This package contains several modules used internally by the OCaml +compilers. They are not needed for normal OCaml development, but may +be helpful in the development of certain applications. + +%package compiler-libs-devel +License: QPL +Group: Development/Libraries/Other +Summary: Libraries used internal to the OCaml Compiler +Requires: ocaml-compiler-libs = %{version}-%{release} + +%description compiler-libs-devel +The %{name}-devel package contains libraries and signature files for +developing applications that use %{name}. + %prep %setup -q -T -b 0 @@ -180,37 +259,45 @@ %patch6 %patch7 %patch8 -%patch9 find -name ".cvsignore" | xargs -r rm -f %build %ifarch %ix86 -export RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-fomit-frame-pointer/} -O0" +# Default OPT flags for these architectures use -fomit-frame-pointer, +# which gets in the way of some of the profiling done within. +export RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-fomit-frame-pointer/}" %endif +CFLAGS="$RPM_OPT_FLAGS" \ ./configure -bindir %{_bindir} \ -libdir %{_libdir}/ocaml \ -mandir %{_mandir} \ -x11include %{_includedir} \ -x11lib %{_libdir} -# -make world %if %{do_opt} -make opt ocamlc.opt ocamlopt.opt +make world.opt +%else +make world %endif %install -make install BINDIR="$RPM_BUILD_ROOT%{_bindir}" LIBDIR="$RPM_BUILD_ROOT%{_libdir}/ocaml" MANDIR="$RPM_BUILD_ROOT%{_mandir}" -%if %{do_opt} -make installopt BINDIR="$RPM_BUILD_ROOT%{_bindir}" LIBDIR="$RPM_BUILD_ROOT%{_libdir}/ocaml" MANDIR="$RPM_BUILD_ROOT%{_mandir}" -%endif -# +make install \ + BINDIR="$RPM_BUILD_ROOT%{_bindir}" \ + LIBDIR="$RPM_BUILD_ROOT%{_libdir}/ocaml" \ + MANDIR="$RPM_BUILD_ROOT%{_mandir}" +sed -i -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf + install -d $RPM_BUILD_ROOT%{_infodir} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -(cd emacs -make install BINDIR=$RPM_BUILD_ROOT/%{_bindir} EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -make install-ocamltags BINDIR=$RPM_BUILD_ROOT/%{_bindir} +( + cd emacs + make install BINDIR=$RPM_BUILD_ROOT/%{_bindir} EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + make install-ocamltags BINDIR=$RPM_BUILD_ROOT/%{_bindir} +) + +( + cd infoman; cp -f ocaml* $RPM_BUILD_ROOT%{_infodir} ) -(cd infoman; cp -f ocaml* $RPM_BUILD_ROOT%{_infodir}) + # fix bnc#411232 echo '(load "ocaml.el" nil t t)' >$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/suse-start-ocaml.el cat <<EOF >$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/%{name}.el @@ -218,11 +305,13 @@ (add-hook 'caml-mode-hook 'font-lock-mode) (add-to-list 'auto-mode-alist '("\\\\.mli?$" . caml-mode)) EOF -export EXCLUDE_FROM_STRIP="ocamldebug ocamlbrowser" -sed s,$RPM_BUILD_ROOT,,g < $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf >/tmp/buildroot_sucks_ass -mv /tmp/buildroot_sucks_ass $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf -sed -i -e "s@$RPM_BUILD_ROOT@@" $RPM_BUILD_ROOT/%{_libdir}/ocaml/Makefile.config sed -i '1s/^/#!\/usr\/bin\/ocaml\n/' $RPM_BUILD_ROOT/%{_bindir}/ocamltags + +export EXCLUDE_FROM_STRIP="ocamldebug ocamlbrowser" + +# Install the compiler libs +install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/compiler-libs +cp -a typing/ utils/ parsing/ $RPM_BUILD_ROOT%{_libdir}/ocaml/compiler-libs %fdupes $RPM_BUILD_ROOT %post @@ -239,8 +328,30 @@ %doc Changes LICENSE README %{_bindir}/* %{_mandir}/*/* -%{_libdir}/ocaml +%{_libdir}/ocaml/*.a +%{_libdir}/ocaml/*.cmxs +%{_libdir}/ocaml/*.cmxa +%{_libdir}/ocaml/*.cmx +%{_libdir}/ocaml/*.mli +%{_libdir}/ocaml/*.o +%{_libdir}/ocaml/libcamlrun_shared.so +%{_libdir}/ocaml/vmthreads/*.mli +%{_libdir}/ocaml/vmthreads/*.a +%{_libdir}/ocaml/threads/*.a +%{_libdir}/ocaml/threads/*.cmxa +%{_libdir}/ocaml/threads/*.cmx +%{_libdir}/ocaml/caml +%{_libdir}/ocaml/ocamlbuild +%{_libdir}/ocaml/Makefile.config +%{_libdir}/ocaml/extract_crc +%{_libdir}/ocaml/camlheader +%{_libdir}/ocaml/camlheader_ur +%{_libdir}/ocaml/expunge +%{_libdir}/ocaml/ld.conf +%{_libdir}/ocaml/objinfo_helper +%exclude %{_libdir}/ocaml/graphicsX11.mli %{_infodir}/* +%exclude %{_bindir}/ocamlrun %exclude %{_bindir}/camlp4* %exclude %{_bindir}/mkcamlp4 %exclude %{_bindir}/labltk @@ -252,20 +363,94 @@ %exclude %{_libdir}/ocaml/ocamldoc %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so -%files -n labltk +%files runtime +%defattr(-,root,root,-) +%{_bindir}/ocamlrun +%dir %{_libdir}/ocaml +%{_libdir}/ocaml/*.cmo +%{_libdir}/ocaml/*.cmi +%{_libdir}/ocaml/*.cma +%{_libdir}/ocaml/stublibs +%dir %{_libdir}/ocaml/vmthreads +%{_libdir}/ocaml/vmthreads/*.cmi +%{_libdir}/ocaml/vmthreads/*.cma +%dir %{_libdir}/ocaml/threads +%{_libdir}/ocaml/threads/*.cmi +%{_libdir}/ocaml/threads/*.cma +%exclude %{_libdir}/ocaml/graphicsX11.cmi +%exclude %{_libdir}/ocaml/stublibs/dlllabltk.so +%doc README LICENSE Changes + +%files x11 +%defattr(-,root,root,-) +%{_libdir}/ocaml/graphicsX11.cmi +%{_libdir}/ocaml/graphicsX11.mli + +%files source +%defattr(-,root,root,-) +%{_libdir}/ocaml/*.ml + +%files labltk %defattr(-,root,root,-) %{_bindir}/labltk -%{_bindir}/ocamlbrowser -%{_libdir}/ocaml/labltk +%dir %{_libdir}/ocaml/labltk +%{_libdir}/ocaml/labltk/*.cmi +%{_libdir}/ocaml/labltk/*.cma +%{_libdir}/ocaml/labltk/*.cmo %{_libdir}/ocaml/stublibs/dlllabltk.so + + +%files labltk-devel +%defattr(-,root,root,-) +%{_bindir}/ocamlbrowser +%{_libdir}/ocaml/labltk/labltktop +%{_libdir}/ocaml/labltk/pp +%{_libdir}/ocaml/labltk/tkcompiler +%{_libdir}/ocaml/labltk/*.a +%{_libdir}/ocaml/labltk/*.cmxa +%{_libdir}/ocaml/labltk/*.cmx +%{_libdir}/ocaml/labltk/*.mli +%{_libdir}/ocaml/labltk/*.o %doc otherlibs/labltk/examples_labltk %doc otherlibs/labltk/examples_camltk -%files -n camlp4 +%files camlp4 +%defattr(-,root,root,-) +%dir %{_libdir}/ocaml/camlp4 +%{_libdir}/ocaml/camlp4/*.cmi +%{_libdir}/ocaml/camlp4/*.cma +%{_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 -%{_libdir}/ocaml/camlp4 +%{_libdir}/ocaml/camlp4/*.a +%{_libdir}/ocaml/camlp4/*.cmxa +%{_libdir}/ocaml/camlp4/*.cmx +%{_libdir}/ocaml/camlp4/*.o +%{_libdir}/ocaml/camlp4/Camlp4Filters/*.cmx +%{_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 +#%%{_mandir}/man1/* %files ocamldoc %defattr(-,root,root,-) @@ -285,4 +470,23 @@ %{_datadir}/emacs/site-lisp/* %{_bindir}/ocamltags +%files compiler-libs +%defattr(-,root,root,-) +%doc LICENSE README +%{_libdir}/ocaml/compiler-libs +#%%exclude %{_libdir}/ocaml/compiler-libs/*/*.cmo +%exclude %{_libdir}/ocaml/compiler-libs/*/*.cmx +%exclude %{_libdir}/ocaml/compiler-libs/*/*.mli +%exclude %{_libdir}/ocaml/compiler-libs/*/*.o +%exclude %{_libdir}/ocaml/compiler-libs/*/*.ml + +%files compiler-libs-devel +%defattr(-,root,root,-) +%doc LICENSE README +#%%{_libdir}/ocaml/compiler-libs/*/*.cmo +%{_libdir}/ocaml/compiler-libs/*/*.cmx +%{_libdir}/ocaml/compiler-libs/*/*.mli +%{_libdir}/ocaml/compiler-libs/*/*.o +%{_libdir}/ocaml/compiler-libs/*/*.ml + %changelog ++++++ ocaml-3.12.0.tar.bz2 -> ocaml-3.12.1.tar.bz2 ++++++ ++++ 81656 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
