Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2019-11-30 10:35:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml" Sat Nov 30 10:35:45 2019 rev:73 rq:750769 version:4.05.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2019-11-07 23:14:19.448390041 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml.new.26869/ocaml.changes 2019-11-30 10:36:26.500178962 +0100 @@ -1,0 +2,9 @@ +Mon Nov 25 12:34:56 UTC 2019 - ohering@suse.de + +- move topdirs.cmi/cmt/cmti from runtime to compiler-libs-devel + so that runtime does not depend on a devel pkg (bsc#1156934) +- split place for META files, some go to ocaml, some to compiler-libs-devel +- move ncurses-devel requires to ocaml, it is used by BYTECCLIBS +- initialize bcond ocaml_make_testsuite + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.KY1bNt/_old 2019-11-30 10:36:28.944178669 +0100 +++ /var/tmp/diff_new_pack.KY1bNt/_new 2019-11-30 10:36:28.948178668 +0100 @@ -24,6 +24,7 @@ # This ensures that the find_provides/find_requires calls ocamlobjinfo correctly. %global __ocaml_requires_opts -c -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" %global __ocaml_provides_opts -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" +%bcond_with ocaml_make_testsuite Name: ocaml Version: 4.05.0 @@ -41,13 +42,13 @@ 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 -# This gets ocamlobjinfo to work with .cmxs files BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) BuildRequires: ocaml-rpm-macros >= 20191101 +Requires: ncurses-devel Requires: ocaml(runtime) = %{version}-%{release} Obsoletes: ocaml-docs Provides: ocaml(compiler) = %{ocaml_base_version} @@ -116,7 +117,7 @@ Summary: Libraries used internal to the OCaml Compiler License: QPL-1.0 Group: Development/Languages/OCaml -Requires: ncurses-devel +Requires: ocaml = %{version}-%{release} %description compiler-libs OCaml is a high-level, strongly-typed, functional and object-oriented @@ -130,7 +131,7 @@ Summary: Libraries used internal to the OCaml Compiler License: QPL-1.0 Group: Development/Languages/OCaml -Requires: ocaml-compiler-libs = %{version} +Requires: ocaml-compiler-libs = %{version}-%{release} %description compiler-libs-devel OCaml is a high-level, strongly-typed, functional and object-oriented @@ -409,9 +410,12 @@ ocamldoc) files='files.ocamldoc.META' ;; - *) + compiler-libs) files='files.compiler-libs.META' ;; + *) + files='files.ocaml.META' + ;; esac d=%{_libdir}/ocaml/${ocamlfind} f=${d}/META @@ -479,6 +483,9 @@ %{_libdir}/ocaml/threads/*.cma %{_libdir}/ocaml/threads/*.cmti %exclude %{_libdir}/ocaml/graphicsX11.cmi +%exclude %{_libdir}/ocaml/topdirs.cmi +%exclude %{_libdir}/ocaml/topdirs.cmt +%exclude %{_libdir}/ocaml/topdirs.cmti %doc Changes %license LICENSE @@ -494,11 +501,18 @@ %{_libdir}/ocaml/ocamldoc %doc ocamldoc/Changes.txt -%files compiler-libs -f files.compiler-libs.META -%license LICENSE +%files compiler-libs %dir %{_libdir}/ocaml +%{_libdir}/ocaml/topdirs.cmi +%{_libdir}/ocaml/topdirs.cmt +%{_libdir}/ocaml/topdirs.cmti +%{_libdir}/ocaml/compiler-libs/*.cma +%{_libdir}/ocaml/compiler-libs/*.cmi +%{_libdir}/ocaml/compiler-libs/*.cmo +%{_libdir}/ocaml/compiler-libs/*.cmt +%{_libdir}/ocaml/compiler-libs/*.cmti -%files compiler-libs-devel +%files compiler-libs-devel -f files.compiler-libs.META %dir %{_libdir}/ocaml/compiler-libs %if %{ocaml_native_compiler} %{_libdir}/ocaml/compiler-libs/*.a @@ -506,11 +520,6 @@ %{_libdir}/ocaml/compiler-libs/*.cmx %{_libdir}/ocaml/compiler-libs/*.cmxa %endif -%{_libdir}/ocaml/compiler-libs/*.cma -%{_libdir}/ocaml/compiler-libs/*.cmi -%{_libdir}/ocaml/compiler-libs/*.cmo -%{_libdir}/ocaml/compiler-libs/*.cmt -%{_libdir}/ocaml/compiler-libs/*.cmti %{_libdir}/ocaml/compiler-libs/*.mli %if %{with ocaml_make_testsuite}