pool/ocaml-rpm-macros
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use tag 'suseocaml', rename zocaml.attr to suseocaml.attr to

Browse Source 
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
This commit is contained in:
Olaf Hering 2020-05-14 09:40:00 +00:00 committed by Git OBS Bridge
parent 5b8baeb9af
commit 819290d21a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ocaml-rpm-macros.changes
View File

@ -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
-------------------------------------------------------------------

4
ocaml-rpm-macros.spec
View File

@ -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