Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-rpm-macros for openSUSE:Factory checked in at 2021-11-06 18:13:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-rpm-macros" Sat Nov 6 18:13:15 2021 rev:15 rq:928950 version:20211027 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes 2021-09-28 19:16:20.048172153 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1890/ocaml-rpm-macros.changes 2021-11-06 18:13:28.852742515 +0100 @@ -1,0 +2,9 @@ +Wed Oct 27 07:31:27 UTC 2021 - oher...@suse.de + +- Move cmxs files into the main package + Applications like Coq may load them at runtime. +- Ignore dependencies for cmxs files +- Restore dummy ocaml_native_compiler to allow quilt setup with + old packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.NTrlYW/_old 2021-11-06 18:13:29.604742909 +0100 +++ /var/tmp/diff_new_pack.NTrlYW/_new 2021-11-06 18:13:29.608742910 +0100 @@ -17,7 +17,7 @@ Name: ocaml-rpm-macros -Version: 20210911 +Version: 20211027 Release: 0 Summary: RPM macros for building OCaml source packages License: GPL-2.0-only @@ -73,8 +73,8 @@ tee %{buildroot}${file_attr} <<_EOF_ %%__${tag}_provides ${attr_sh} --provides %%__${tag}_requires ${attr_sh} --requires -%%__${tag}_magic ^(ELF|Objective caml|OCaml) .*$ -%%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$ +%%__${tag}_magic ^(Objective caml|OCaml) .*$ +%%__${tag}_path .(cma|cmi|cmo|cmx|cmxa)$ %%__${tag}_flags magic_and_path _EOF_ echo "${file_attr}" >> files.fileattrs @@ -128,6 +128,10 @@ %%{nil} %%_find_debuginfo_dwz_opts %%{nil} +# Compatibility for quilt setup and old packages +%%ocaml_native_compiler 1 +%%suse_ocaml_native_compiler 1 + # Create file list for base pkg and base-devel pkg # Files with known extensions or names are written to 'files' or 'files.devel' # Other unknown files are shown on stdout @@ -173,6 +177,7 @@ find %%{buildroot}%%{ocaml_standard_library} ! -type d | awk\\\ -v "buildroot=%%{buildroot}"\\\ -v "ocaml_standard_library=%%{ocaml_standard_library}"\\\ + -v "out_files_main=%%{name}.files"\\\ -v "out_files_devel=%%{name}.files.devel"\\\ -v "out_files_ldconf=%%{name}.files.ldsoconf"\\\ -v "out_files_unhandled=%%{name}.files.unhandled"\\\ @@ -224,6 +229,15 @@ }\ next\ }\ + function files_main(line) {\ + _split(line)\ + print file_path >> out_files_main\ + print "%%dir " dirname >> out_files_main\ + if (parent_dir != "") {\ + print "%%dir " parent_dir >> out_files_main\ + }\ + next\ + }\ function files_unhandled(line) {\ _split(line)\ print file_path >> out_files_unhandled\ @@ -279,7 +293,7 @@ }\ # ELF shared library with native code\ /\\/[^/]+\\.cmxs$/{\ - files_devel($0)\ + files_main($0)\ }\ # Some helper binary\ /\\/[^/]+\\.exe$/{\ ++++++ ocaml-ocaml.rpm.prov_req.attr.sh ++++++ --- /var/tmp/diff_new_pack.NTrlYW/_old 2021-11-06 18:13:29.636742925 +0100 +++ /var/tmp/diff_new_pack.NTrlYW/_new 2021-11-06 18:13:29.636742925 +0100 @@ -32,6 +32,10 @@ # Implementations imported: # HASH NAME_FROM_OTHER_MODULE # +# cmxs files are recoqnized, but need to be ignored. +# They contain references of the interfaces and implementations +# compiled into them. +# # The hash may contain just '-', in which case it is ignored. # # Output: @@ -236,7 +240,7 @@ *.cmo) parse "${filename}" ;; *.cmx) parse "${filename}" ;; *.cmxa) parse "${filename}" ;; - *.cmxs) parse "${filename}" ;; + *.cmxs) ;; *) continue ;; esac done