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

Accepting request 805574 from devel:languages:ocaml

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/805574
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-rpm-macros?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger
2020-05-20 16:35:35 +00:00
committed by Git OBS Bridge
parent 6e347e4e59 819290d21a
commit 86a49ecc3a
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ocaml-rpm-macros.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
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.
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
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 12 12:12:12 UTC 2020 - ohering@suse.de Sun Apr 12 12:12:12 UTC 2020 - ohering@suse.de

27
ocaml-rpm-macros.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package ocaml-rpm-macros # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
# #
Name: ocaml-rpm-macros Name: ocaml-rpm-macros
Version: 20200412 Version: 20200514
Release: 0 Release: 0
Summary: RPM macros for building OCaml source packages Summary: RPM macros for building OCaml source packages
License: GPL-2.0-only License: GPL-2.0-only
@@ -63,25 +63,26 @@ in ocaml spec files.
%install %install
# map ocamlobjinfo output to rpm Provides/Requires # 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 mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
tee %{buildroot}%{_rpmconfigdir}/fileattrs/z${tag}.attr <<_EOF_ tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides %%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires %%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
%__${tag}_magic ^(ELF|Objective caml|OCaml) .*$ %%__${tag}_magic ^(ELF|Objective caml|OCaml) .*$
%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$ %%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
%__${tag}_flags magic_and_path %%__${tag}_flags magic_and_path
_EOF_ _EOF_
# #
tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0} tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0}
# map findlib names to rpm Provides/Requires # map findlib names to rpm Provides/Requires
tag="ocamlfind" tag="suseocamlfind"
mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_ tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov %%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req %%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
%__${tag}_path ^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$ %%__${tag}_path ^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
_EOF_ _EOF_
# #
tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1} tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1}