From a8442223dc85c65d9aa33aec4089d4d65d355f880cd4ae7b59f011e041f21ea5 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 8 Jul 2022 06:55:48 +0000 Subject: [PATCH] - Handle plain ^ and + as values for directory= in findlib META files They stand for the OCaml standard library directory. OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=74 --- ocaml-findlib.rpm.prov_req.attr.sh | 5 ++++- ocaml-rpm-macros.changes | 6 ++++++ ocaml-rpm-macros.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.rpm.prov_req.attr.sh b/ocaml-findlib.rpm.prov_req.attr.sh index 219857e..af95834 100644 --- a/ocaml-findlib.rpm.prov_req.attr.sh +++ b/ocaml-findlib.rpm.prov_req.attr.sh @@ -56,7 +56,10 @@ do_work() { if ( a[2] ) { candidate = a[2]; if(dbg) printf "dir: %s %s\n", x, candidate > "/dev/stderr" ; - if (candidate ~ /^\^/) { + if (candidate == "^") { + next + } + if (candidate == "+") { next } if (candidate ~ /^\+/) { diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes index d0f944e..5c81d46 100644 --- a/ocaml-rpm-macros.changes +++ b/ocaml-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 7 07:07:07 UTC 2022 - ohering@suse.de + +- Handle plain ^ and + as values for directory= in findlib META files + They stand for the OCaml standard library directory. + ------------------------------------------------------------------- Sat Apr 9 12:34:56 UTC 2022 - ohering@suse.de diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec index 58c3558..88f4fce 100644 --- a/ocaml-rpm-macros.spec +++ b/ocaml-rpm-macros.spec @@ -17,7 +17,7 @@ Name: ocaml-rpm-macros -Version: 20220409 +Version: 20220707 Release: 0 Summary: RPM macros for building OCaml source packages License: GPL-2.0-only