Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at Wed May 18 15:27:13 CEST 2011.
-------- --- ocaml/ocaml.changes 2010-08-24 17:58:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/ocaml/ocaml.changes 2011-04-27 16:24:14.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 27 10:02:51 UTC 2011 - [email protected] + +- license correction to GPLv2 and QPL +- removed author from spec + +------------------------------------------------------------------- +Tue Apr 26 11:43:56 UTC 2011 - [email protected] + +- Add ocaml-3.12-fix-size-directive.patch: + incorrect .size directives generated for x86-32 and x86-64 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ocaml-3.12-fix-size-directive.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.0rcLRz/_old 2011-05-18 15:26:15.000000000 +0200 +++ /var/tmp/diff_new_pack.0rcLRz/_new 2011-05-18 15:26:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ocaml (Version 3.12.0) +# spec file for package ocaml # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ Name: ocaml BuildRequires: emacs-nox fdupes gdbm-devel ncurses-devel tk-devel -License: GPLv2+ ; QPL .. +License: GPLv2 and QPL Group: Development/Languages/Other AutoReqProv: on Version: 3.12.0 -Release: 1 +Release: 5 %define doc_version 3.12 %ifarch s390 s390x %define do_opt 0 @@ -44,6 +44,8 @@ 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 @@ -59,11 +61,6 @@ system, Lex&Yacc tools, a replay debugger, and a comprehensive library. - -Authors: --------- - Pierre Weis <[email protected]> - %package devel License: GPLv2+ ; QPL .. Summary: The Objective Caml Compiler and Programming Environment @@ -82,10 +79,6 @@ -Authors: --------- - Pierre Weis <[email protected]> - %package -n labltk License: GPLv2+ ; QPL .. Group: Development/Languages/Other @@ -102,10 +95,6 @@ -Authors: --------- - Pierre Weis <[email protected]> - %package -n camlp4 License: GPLv2+ ; QPL .. Group: Development/Languages/Other @@ -122,10 +111,6 @@ -Authors: --------- - Pierre Weis <[email protected]> - %package ocamldoc License: GPLv2+ ; QPL .. Group: Development/Languages/Other @@ -142,10 +127,6 @@ -Authors: --------- - Pierre Weis <[email protected]> - %package emacs License: GPLv2+ ; QPL .. Group: Development/Languages/Other @@ -163,10 +144,6 @@ -Authors: --------- - Pierre Weis <[email protected]> - %package docs License: GPLv2+ ; QPL .. Group: Development/Languages/Other @@ -182,11 +159,6 @@ system, Lex&Yacc tools, a replay debugger, and a comprehensive library. - -Authors: --------- - Pierre Weis <[email protected]> - %prep %setup -q -T -b 0 %setup -q -T -D -a 1 @@ -200,6 +172,7 @@ %patch6 %patch7 %patch8 +%patch9 find -name ".cvsignore" | xargs -r rm -f %build ++++++ ocaml-3.12-fix-size-directive.patch ++++++ PR#5237: incorrect .size directives generated for x86-32 and x86-64 See http://caml.inria.fr/cgi-bin/viewcvs.cgi?diff_format=u&rev=10981&view=rev --- asmcomp/amd64/emit.mlp 2011/03/13 13:33:17 10980 +++ asmcomp/amd64/emit.mlp 2011/03/13 13:36:00 10981 @@ -688,17 +688,18 @@ emit_all true fundecl.fun_body; List.iter emit_call_gc !call_gc_sites; emit_call_bound_errors (); + begin match Config.system with + "linux" | "gnu" -> + ` .type {emit_symbol fundecl.fun_name},@function\n`; + ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` + | _ -> () + end; if !float_constants <> [] then begin if macosx then ` .literal8\n` else ` .section .rodata.cst8,\"a\",@progbits\n`; List.iter emit_float_constant !float_constants - end; - match Config.system with - "linux" | "gnu" -> - ` .type {emit_symbol fundecl.fun_name},@function\n`; - ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` - | _ -> () + end (* Emission of data *) --- asmcomp/i386/emit.mlp 2011/03/13 13:33:17 10980 +++ asmcomp/i386/emit.mlp 2011/03/13 13:36:00 10981 @@ -905,12 +905,12 @@ emit_all true fundecl.fun_body; List.iter emit_call_gc !call_gc_sites; emit_call_bound_errors (); - List.iter emit_float_constant !float_constants; - match Config.system with + begin match Config.system with "linux_elf" | "bsd_elf" | "gnu" -> ` .type {emit_symbol fundecl.fun_name},@function\n`; ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` - | _ -> () + | _ -> () end; + List.iter emit_float_constant !float_constants (* Emission of data *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
