Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2020-05-20 18:35:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml" Wed May 20 18:35:39 2020 rev:78 rq:805738 version:4.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2020-04-15 19:52:50.753554383 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new.2738/ocaml.changes 2020-05-20 18:35:41.328007704 +0200 @@ -1,0 +2,8 @@ +Thu May 14 14:14:14 UTC 2020 - [email protected] + +- The filename for rpm *.attr files and the tag used within these + files must match. Otherwise rpm will not execute the helper scripts. + Use helper 'suseocaml' in addition to 'ocaml' to avoid + filename conflicts with rpm-build.rpm (bsc#1154874) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.p755Db/_old 2020-05-20 18:35:41.964009037 +0200 +++ /var/tmp/diff_new_pack.p755Db/_new 2020-05-20 18:35:41.964009037 +0200 @@ -21,15 +21,30 @@ %define ocaml_base_version 4.10 # # This ensures that the find_provides/find_requires calls ocamlobjinfo correctly. +# handle built-in ocaml helper from rpm-build, and helper from ocaml-rpm-macros %if %{ocaml_native_compiler} +%global __suseocaml_requires_opts \ + -c \ + -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ + %{nil} %global __ocaml_requires_opts \ -c \ -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ %{nil} +%global __suseocaml_provides_opts \ + -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ + %{nil} %global __ocaml_provides_opts \ -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ %{nil} %else +%global __suseocaml_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_requires_opts \ -c \ -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ @@ -37,6 +52,9 @@ -i Inlining_decision_intf \ -i Simplify_boxed_integer_ops_intf \ %{nil} +%global __suseocaml_provides_opts \ + -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ + %{nil} %global __ocaml_provides_opts \ -f "%{_bindir}/env OCAMLLIB=%{buildroot}%{ocaml_standard_library} %{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo.byte" \ %{nil} @@ -58,7 +76,7 @@ BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: pkgconfig -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20200514 Requires: ncurses-devel Requires: ocaml(runtime) = %{version}-%{release} Obsoletes: ocaml-docs
