Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2020-03-03 10:14:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml" Tue Mar 3 10:14:47 2020 rev:75 rq:780709 version:4.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2020-02-26 15:01:56.240818984 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml.new.26092/ocaml.changes 2020-03-03 10:14:57.530491280 +0100 @@ -1,0 +2,19 @@ +Sat Feb 29 20:20:20 UTC 2020 - [email protected] + +- update version 4.10.0, with _service file + See included Changes for benefits and breaking changes +- Drop x11 sub package, moved to ocaml-graphics +- Adjust ocaml-configure-Allow-user-defined-C-compiler-flags.patch +- Adjust rpmlintrc +- Remove obsolete ocaml-3.08.3-gcc4.patch +- Remove obsolete ocaml-4.05.0-CVE-2018-9838.patch +- Remove obsolete ocaml-4.05.0.tar.xz +- Remove obsolete ocaml-Fixes-for-out-of-range-Ialloc.patch +- Remove obsolete ocaml-In-caml_executable_name-wrong-test-on-the-return-cod.patch +- Remove obsolete ocaml-MPR-7591-frametable-not-8-aligned-on-x86-64-port.patch +- Remove obsolete ocaml-assert.patch +- Remove obsolete ocaml-byterun-do-not-alias-function-arguments-to-sigprocma.patch +- Remove obsolete ocaml-fix_aarch64_build.patch +- Remove obsolete ocamldoc-man-th.patch + +------------------------------------------------------------------- Old: ---- ocaml-3.08.3-gcc4.patch ocaml-4.05.0-CVE-2018-9838.patch ocaml-4.05.0.tar.xz ocaml-Fixes-for-out-of-range-Ialloc.patch ocaml-In-caml_executable_name-wrong-test-on-the-return-cod.patch ocaml-MPR-7591-frametable-not-8-aligned-on-x86-64-port.patch ocaml-assert.patch ocaml-byterun-do-not-alias-function-arguments-to-sigprocma.patch ocaml-fix_aarch64_build.patch ocamldoc-man-th.patch New: ---- _service ocaml-4.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.4YGGqc/_old 2020-03-03 10:14:58.710493722 +0100 +++ /var/tmp/diff_new_pack.4YGGqc/_new 2020-03-03 10:14:58.710493722 +0100 @@ -18,9 +18,10 @@ # -%define ocaml_base_version 4.05 +%define ocaml_base_version 4.10 # # This ensures that the find_provides/find_requires calls ocamlobjinfo correctly. +%if %{ocaml_native_compiler} %global __ocaml_requires_opts \ -c \ -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ @@ -28,10 +29,22 @@ %global __ocaml_provides_opts \ -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ %{nil} +%else +%global __ocaml_requires_opts \ + -c \ + -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ + -i Backend_intf \ + -i Inlining_decision_intf \ + -i Simplify_boxed_integer_ops_intf \ + %{nil} +%global __ocaml_provides_opts \ + -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ + %{nil} +%endif %bcond_with ocaml_make_testsuite Name: ocaml -Version: 4.05.0 +Version: 4.10.0 Release: 0 Summary: OCaml Compiler and Programming Environment License: QPL-1.0 AND SUSE-LGPL-2.0-with-linking-exception @@ -39,23 +52,12 @@ Url: http://www.ocaml.org Source0: http://caml.inria.fr/pub/distrib/ocaml-%{ocaml_base_version}/ocaml-%{version}.tar.xz Source2: rpmlintrc -Patch0: ocaml-MPR-7591-frametable-not-8-aligned-on-x86-64-port.patch -Patch1: ocamldoc-man-th.patch -Patch2: ocaml-Fixes-for-out-of-range-Ialloc.patch -Patch3: ocaml-In-caml_executable_name-wrong-test-on-the-return-cod.patch -# FIX-UPSTREAM pass RPM_OPT_FLAGS to build -Patch4: ocaml-configure-Allow-user-defined-C-compiler-flags.patch -Patch5: ocaml-3.08.3-gcc4.patch -Patch6: ocaml-byterun-do-not-alias-function-arguments-to-sigprocma.patch -Patch7: ocaml-assert.patch -Patch8: ocaml-4.05.0-CVE-2018-9838.patch -# FIX-UPSTREAM backport 'AArch64 GOT fixed' - https://github.com/ocaml/ocaml/pull/1330 -Patch9: ocaml-fix_aarch64_build.patch +Patch0: ocaml-configure-Allow-user-defined-C-compiler-flags.patch +BuildRequires: autoconf BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(x11) BuildRequires: ocaml-rpm-macros >= 20200220 Requires: ncurses-devel Requires: ocaml(runtime) = %{version}-%{release} @@ -66,6 +68,12 @@ Requires: %(type -p gcc | xargs readlink -f) Provides: ocaml(ocaml.opt) = %{ocaml_base_version} %endif +Obsoletes: ocaml-seq < %{version}-%{release} +Obsoletes: ocaml-seq-debuginfo < %{version}-%{release} +Obsoletes: ocaml-seq-devel < %{version}-%{release} +Provides: ocaml-seq = %{version}-%{release} +Provides: ocaml-seq-debuginfo = %{version}-%{release} +Provides: ocaml-seq-devel = %{version}-%{release} %description OCaml is a high-level, strongly-typed, functional and object-oriented @@ -99,17 +107,6 @@ This package contains source code for OCaml libraries. -%package x11 -Summary: X11 support for OCaml -License: SUSE-LGPL-2.0-with-linking-exception -Group: Development/Languages/OCaml - -%description x11 -OCaml is a high-level, strongly-typed, functional and object-oriented -programming language from the ML family of languages. - -This package contains X11 support for OCaml. - %package ocamldoc Summary: Documentation generator for OCaml License: QPL-1.0 @@ -150,26 +147,25 @@ applications that use Ocaml. %prep -: do_opt %{ocaml_native_compiler} %autosetup -p1 %build echo %{version} > VERSION +test -x "$(type -p gcc | xargs readlink -f)" && export CC="$_" +test -x "$(type -p as | xargs readlink -f)" && export AS="$_" +export ASPP="$CC -c" %if %{ocaml_native_compiler} -make_target='world.opt' +configure_target='--enable-native-compiler' %else -make_target='world' +configure_target='--disable-native-compiler' %endif -env \ -CFLAGS='-Werror=implicit-function-declaration -Werror=return-type' \ -./configure -bindir %{_bindir} \ - -libdir %{ocaml_standard_library} \ - -no-cplugins \ - -cc "$(type -p gcc | xargs readlink -f)" \ - -mandir %{_mandir} - -make_target+=" -j1" -%make_build ${make_target} +export EXTRA_CFLAGS='-Werror=implicit-function-declaration -Werror=return-type' +bash -x autogen +./configure --help +%configure \ + ${configure_target} \ + --libdir=%{ocaml_standard_library} +%make_build # pushd testsuite tee checker.sh <<'_EOF_' @@ -290,34 +286,6 @@ archive(native) = "dynlink.cmxa" _META_ # -tee graphics <<_META_ -# Specifications for the "graphics" library: -requires = "" -version = "OCaml %{version}" -description = "Portable drawing primitives" -directory = "^" -browse_interfaces = " Unit name: Graphics Unit name: GraphicsX11 " -archive(byte) = "graphics.cma" -archive(native) = "graphics.cmxa" -plugin(byte) = "graphics.cma" -plugin(native) = "graphics.cmxs" -_META_ -tee num <<_META_ -requires = "num.core" -requires(toploop) = "num.core" -version = "OCaml %{version}" -description = "Arbitrary-precision rational arithmetic" -package "core" ( - version = "OCaml %{version}" - directory = "^" - browse_interfaces = " Unit name: Arith_flags Unit name: Arith_status Unit name: Big_int Unit name: Int_misc Unit name: Nat Unit name: Num Unit name: Ratio " - archive(byte) = "nums.cma" - archive(native) = "nums.cmxa" - plugin(byte) = "nums.cma" - plugin(native) = "nums.cmxs" -) -_META_ -# tee ocamldoc <<_META_ requires = "compiler-libs" version = "OCaml %{version}" @@ -337,6 +305,12 @@ plugin(native) = "raw_spacetime_lib.cmxs" _META_ # +tee seq <<_META_ +version = "OCaml %{version}" +description = "" +requires = "" +_META_ +# tee stdlib <<_META_ requires = "" description = "Standard library" @@ -412,6 +386,9 @@ _META_ # popd +> 'files.ocaml.META' +> 'files.ocamldoc.META' +> 'files.compiler-libs.META' for META in META/* do ocamlfind=${META##*/} @@ -456,13 +433,12 @@ %if %{ocaml_native_compiler} %{ocaml_standard_library}/libasmrun_shared.so %endif -%{ocaml_standard_library}/vmthreads/*.mli -%{ocaml_standard_library}/vmthreads/*.a %if %{ocaml_native_compiler} %{ocaml_standard_library}/threads/*.a %{ocaml_standard_library}/threads/*.cmxa %{ocaml_standard_library}/threads/*.cmx %endif +%{ocaml_standard_library}/threads/*.mli %{ocaml_standard_library}/caml %{ocaml_standard_library}/Makefile.config %{ocaml_standard_library}/VERSION @@ -472,7 +448,8 @@ %{ocaml_standard_library}/expunge %{ocaml_standard_library}/ld.conf %{ocaml_standard_library}/objinfo_helper -%exclude %{ocaml_standard_library}/graphicsX11.mli +%{ocaml_standard_library}/camlheaderd +%{ocaml_standard_library}/camlheaderi %exclude %{_bindir}/ocamlrun %exclude %{_bindir}/ocamldoc* %exclude %{ocaml_standard_library}/ocamldoc @@ -486,25 +463,16 @@ %{ocaml_standard_library}/*.cmti %{ocaml_standard_library}/*.cma %{ocaml_standard_library}/stublibs -%dir %{ocaml_standard_library}/vmthreads -%{ocaml_standard_library}/vmthreads/*.cmi -%{ocaml_standard_library}/vmthreads/*.cma -%{ocaml_standard_library}/vmthreads/*.cmti %dir %{ocaml_standard_library}/threads %{ocaml_standard_library}/threads/*.cmi %{ocaml_standard_library}/threads/*.cma %{ocaml_standard_library}/threads/*.cmti -%exclude %{ocaml_standard_library}/graphicsX11.cmi %exclude %{ocaml_standard_library}/topdirs.cmi %exclude %{ocaml_standard_library}/topdirs.cmt %exclude %{ocaml_standard_library}/topdirs.cmti %doc Changes %license LICENSE -%files x11 -%{ocaml_standard_library}/graphicsX11.cmi -%{ocaml_standard_library}/graphicsX11.mli - %files source %{ocaml_standard_library}/*.ml ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml</param> <param name="revision">9d2a531ea9738f47d6fe71c6e0a0255dda613f4b</param> <param name="scm">git</param> <param name="url">https://github.com/ocaml/ocaml.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">[v]?([^+]+)(.*)</param> <param name="versionrewrite-replacement">\1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ ocaml-4.05.0.tar.xz -> ocaml-4.10.0.tar.xz ++++++ ++++ 591998 lines of diff (skipped) ++++++ ocaml-configure-Allow-user-defined-C-compiler-flags.patch ++++++ --- /var/tmp/diff_new_pack.4YGGqc/_old 2020-03-03 10:15:01.006498473 +0100 +++ /var/tmp/diff_new_pack.4YGGqc/_new 2020-03-03 10:15:01.034498530 +0100 @@ -6,16 +6,15 @@ configure | 4 ++++ 1 file changed, 4 insertions(+) ---- a/configure -+++ b/configure -@@ -2002,6 +2002,10 @@ if $with_fpic; then - echo "#define CAML_WITH_FPIC" >> m.h - fi +--- a/configure.ac ++++ b/configure.ac +@@ -1738,6 +1738,9 @@ AS_IF([test x"$DEFAULT_STRING" = "xunsaf + [default_safe_string=false], + [default_safe_string=true]) -+# Allow user defined C Compiler flags -+bytecccompopts="$bytecccompopts $CFLAGS" -+nativecccompopts="$nativecccompopts $CFLAGS" +++# Allow user defined C Compiler flags ++common_cflags="$common_cflags $EXTRA_CFLAGS" + - # Finish generated files - - cclibs="$cclibs $mathlib" + oc_cflags="$common_cflags $internal_cflags" + oc_cppflags="$common_cppflags $internal_cppflags" + ocamlc_cflags="$common_cflags $sharedlib_cflags" ++++++ rpmlintrc ++++++ --- /var/tmp/diff_new_pack.4YGGqc/_old 2020-03-03 10:15:01.314499110 +0100 +++ /var/tmp/diff_new_pack.4YGGqc/_new 2020-03-03 10:15:01.334499151 +0100 @@ -1,6 +1 @@ -# This line is mandatory to access the configuration functions -from Config import * - addFilter("ocaml-ocamldoc.* devel-file-in-non-devel-package") -addFilter("labltk.* devel-file-in-non-devel-package") -addFilter("camlp4.* devel-file-in-non-devel-package")
