Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2013-08-06 07:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2013-03-22 21:07:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2013-08-06 07:04:36.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 1 15:31:39 UTC 2013 - m...@suse.com + +- Added ocaml-tcl86.patch to fix build with Tcl 8.6. + +------------------------------------------------------------------- +Mon Jun 3 09:23:34 CEST 2013 - oher...@suse.de + +- Recompress with xz + +------------------------------------------------------------------- Old: ---- ocaml-4.00-refman-html.tar.gz ocaml-4.00-refman.info.tar.gz ocaml-4.00-refman.ps.gz ocaml-4.00.1.tar.bz2 New: ---- ocaml-4.00-refman-html.tar.xz ocaml-4.00-refman.info.tar.xz ocaml-4.00-refman.ps.xz ocaml-4.00.1.tar.xz ocaml-tcl86.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.nJ8y0a/_old 2013-08-06 07:04:36.000000000 +0200 +++ /var/tmp/diff_new_pack.nJ8y0a/_new 2013-08-06 07:04:36.000000000 +0200 @@ -26,10 +26,11 @@ %ifarch s390 s390x ia64 %define do_opt 0 %endif -Source0: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{version}.tar.bz2 -Source1: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman-html.tar.gz -Source2: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman.ps.gz -Source3: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman.info.tar.gz +# http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ +Source0: ocaml-%{version}.tar.xz +Source1: ocaml-%{doc_version}-refman-html.tar.xz +Source2: ocaml-%{doc_version}-refman.ps.xz +Source3: ocaml-%{doc_version}-refman.info.tar.xz Source4: rpmlintrc Patch0: ocaml-3.00-camldebug_el.patch Patch2: ocaml-3.04-ocamltags--no-site-start.patch @@ -42,6 +43,8 @@ Patch8: ocaml-rpmoptflags.patch # FIX-UPSTREAM enable build on PowerPC 64bit platform. Patch9: ocaml-ppc64.patch +# Fix build with Tcl/Tk 8.6 +Patch10: ocaml-tcl86.patch Url: http://caml.inria.fr/ Summary: The Objective Caml Compiler and Programming Environment License: QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception @@ -255,6 +258,7 @@ %patch7 %patch8 -p1 %patch9 -p1 +%patch10 -p1 find -name ".cvsignore" | xargs -r rm -f @@ -273,7 +277,7 @@ ulimit -Hs 65536 ulimit -Ss 65536 %endif -CFLAGS="$RPM_OPT_FLAGS" \ +CFLAGS="$RPM_OPT_FLAGS -DUSE_INTERP_RESULT" \ ./configure -bindir %{_bindir} \ -libdir %{_libdir}/ocaml \ -mandir %{_mandir} \ ++++++ ocaml-tcl86.patch ++++++ Index: ocaml-4.00.1/configure =================================================================== --- ocaml-4.00.1.orig/configure 2013-08-01 16:57:52.833538993 +0200 +++ ocaml-4.00.1/configure 2013-08-01 17:19:23.707026616 +0200 @@ -1450,6 +1450,7 @@ if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." case $tcl_version in + 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;; 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;; 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; @@ -1528,10 +1529,10 @@ if test $has_tk = true; then if test $tk_x11 = yes; then - echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile + echo "TK_DEFS=$tk_defs -DUSE_INTERP_RESULT "'$(X11_INCLUDES)' >> Makefile echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile else - echo "TK_DEFS=$tk_defs" >> Makefile + echo "TK_DEFS=$tk_defs -DUSE_INTERP_RESULT" >> Makefile echo "TK_LINK=$tk_libs" >> Makefile fi otherlibraries="$otherlibraries labltk" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
