From 49a6a32fff919241a6e8be454a1bd264f1be4b21a49f247f11b6f512adc718dd Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 21 Aug 2020 17:06:21 +0000 Subject: [PATCH 1/2] - Package also *.v, for Coq - Package changelog files OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=45 --- ocaml-rpm-macros.changes | 6 ++++++ ocaml-rpm-macros.spec | 22 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes index ae9010d..8bb2373 100644 --- a/ocaml-rpm-macros.changes +++ b/ocaml-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 20 20:20:20 UTC 2020 - ohering@suse.de + +- Package also *.v, for Coq +- Package changelog files + ------------------------------------------------------------------- Thu May 14 14:14:14 UTC 2020 - ohering@suse.de diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec index c2caf81..b90ac11 100644 --- a/ocaml-rpm-macros.spec +++ b/ocaml-rpm-macros.spec @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: ocaml-rpm-macros -Version: 20200514 +Version: 20200820 Release: 0 Summary: RPM macros for building OCaml source packages License: GPL-2.0-only Group: Development/Languages/OCaml -Url: https://build.opensuse.org/project/show/devel:languages:ocaml +URL: https://build.opensuse.org/project/show/devel:languages:ocaml Source0: ocaml-ocaml.rpm.prov_req.attr.sh Source1: ocaml-findlib.rpm.prov_req.attr.sh @@ -127,10 +128,22 @@ tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_' # Other unknown files are shown on stdout %%ocaml_create_file_list \ > %%{name}.files ;\ + > %%{name}.files.changes ;\ > %%{name}.files.devel ;\ > %%{name}.files.ldsoconf ;\ > %%{name}.files.license ;\ > %%{name}.files.unhandled ;\ + for changes in \\\ + CHANGELOG.md \\\ + CHANGES \\\ + CHANGES.md \\\ + CHANGES.txt \\\ + ChangeLog \\\ + Changelog \\\ + ;\ + do\ + test -f "${changes}" && echo "%%%%doc ${changes}" >> '%%{name}.files.changes' ;\ + done ;\ for license in \\\ COPYING \\\ COPYING.txt \\\ @@ -299,12 +312,17 @@ tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_' /\\/opam$/{\ files_devel($0)\ }\ + # Some Coq files\ + /\\/[^/]+\.v$/{\ + files_devel($0)\ + }\ #\ # record unknown paths\ files_unhandled($0)\ END {\ ;\ }' ;\ + cat '%%{name}.files.changes' >> '%%{name}.files' ;\ cat '%%{name}.files.license' >> '%%{name}.files' ;\ if test -s %%{name}.files.ldsoconf ;\ then\ From 33bd43c2c6f499301fbcfc1dc4d39ef993bdfb662c7045b36baac1331077295e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Sun, 23 Aug 2020 17:34:24 +0000 Subject: [PATCH 2/2] - Enable native riscv64 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=46 --- ocaml-rpm-macros.changes | 1 + ocaml-rpm-macros.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes index 8bb2373..38a0aa2 100644 --- a/ocaml-rpm-macros.changes +++ b/ocaml-rpm-macros.changes @@ -3,6 +3,7 @@ Thu Aug 20 20:20:20 UTC 2020 - ohering@suse.de - Package also *.v, for Coq - Package changelog files +- Enable native riscv64 ------------------------------------------------------------------- Thu May 14 14:14:14 UTC 2020 - ohering@suse.de diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec index b90ac11..8c6f092 100644 --- a/ocaml-rpm-macros.spec +++ b/ocaml-rpm-macros.spec @@ -41,7 +41,7 @@ Source1: ocaml-findlib.rpm.prov_req.attr.sh %define do_opt 1 %endif %if %{without ocaml_force_enable_ocaml_opt} -%ifarch %{arm} aarch64 %{ix86} ppc ppc64 ppc64le s390x x86_64 +%ifarch %{arm} aarch64 %{ix86} ppc ppc64 ppc64le riscv64 s390x x86_64 %define do_opt 1 %endif %endif