Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2020-05-20 18:35:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-rpm-macros"
Wed May 20 18:35:35 2020 rev:8 rq:805574 version:20200514
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-04-15 19:52:49.509553821 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2738/ocaml-rpm-macros.changes
2020-05-20 18:35:37.479999640 +0200
@@ -1,0 +2,10 @@
+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 tag 'suseocaml', rename zocaml.attr to suseocaml.attr to
+ avoid filename conflicts with rpm-build.rpm (bsc#1154874)
+- Rename also ocamlfind to suseocamlfind
+- Escape plain % chars
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.N5yJwG/_old 2020-05-20 18:35:38.512001803 +0200
+++ /var/tmp/diff_new_pack.N5yJwG/_new 2020-05-20 18:35:38.512001803 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-rpm-macros
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
Name: ocaml-rpm-macros
-Version: 20200412
+Version: 20200514
Release: 0
Summary: RPM macros for building OCaml source packages
License: GPL-2.0-only
@@ -63,25 +63,26 @@
%install
# map ocamlobjinfo output to rpm Provides/Requires
-tag="ocaml"
+# this tag name MUST match what ocaml.spec uses internally
+tag="suseocaml"
mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
-tee %{buildroot}%{_rpmconfigdir}/fileattrs/z${tag}.attr <<_EOF_
-%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
-%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
-%__${tag}_magic ^(ELF|Objective caml|OCaml) .*$
-%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
-%__${tag}_flags magic_and_path
+tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
+%%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
+%%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
+%%__${tag}_magic ^(ELF|Objective caml|OCaml) .*$
+%%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
+%%__${tag}_flags magic_and_path
_EOF_
#
tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0}
# map findlib names to rpm Provides/Requires
-tag="ocamlfind"
+tag="suseocamlfind"
mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
-%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
-%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
-%__${tag}_path
^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
+%%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
+%%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
+%%__${tag}_path
^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
_EOF_
#
tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1}
