From 819290d21a9cf8a68581b7516b50fab57400714361ae7e6b1a321fb01979d21e Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Thu, 14 May 2020 09:40:00 +0000
Subject: [PATCH] Use tag 'suseocaml', rename zocaml.attr to suseocaml.attr to 
  avoid filename conflicts with rpm-build.rpm (bsc#1154874) - Rename also
 ocamlfind to suseocamlfind

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=43
---
 ocaml-rpm-macros.changes | 4 +++-
 ocaml-rpm-macros.spec    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes
index 891351e..ae9010d 100644
--- a/ocaml-rpm-macros.changes
+++ b/ocaml-rpm-macros.changes
@@ -3,7 +3,9 @@ Thu May 14 14:14:14 UTC 2020 - ohering@suse.de
 
 - The filename for rpm *.attr files and the tag used within these
   files must match. Otherwise rpm will not execute the helper scripts.
-  Stick with tag 'ocaml', rename zocaml.attr to ocaml.attr. (bsc#1154874)
+  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
 
 -------------------------------------------------------------------
diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec
index 8de22b9..c2caf81 100644
--- a/ocaml-rpm-macros.spec
+++ b/ocaml-rpm-macros.spec
@@ -64,7 +64,7 @@ in ocaml spec files.
 %install
 # map ocamlobjinfo output to rpm Provides/Requires
 # this tag name MUST match what ocaml.spec uses internally
-tag="ocaml"
+tag="suseocaml"
 mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
 tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
 %%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
@@ -77,7 +77,7 @@ _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