1
0

5 Commits

3 changed files with 24 additions and 5 deletions

View File

@@ -12,6 +12,7 @@ trap _x EXIT
cmd= cmd=
test "$1" = "-prov" && cmd=prov test "$1" = "-prov" && cmd=prov
test "$1" = "-req" && cmd=req test "$1" = "-req" && cmd=req
pkg_version="$2"
do_work() { do_work() {
local f=$1 local f=$1
local pkg_name local pkg_name
@@ -214,7 +215,7 @@ do_work() {
pkg_req="${pkg_req//,/ }" pkg_req="${pkg_req//,/ }"
if test -n "${pkg_prov}" && test "${cmd}" = "prov" if test -n "${pkg_prov}" && test "${cmd}" = "prov"
then then
echo "${prov_req_name}($pkg_prov)" echo "${prov_req_name}($pkg_prov) = ${pkg_version}"
fi fi
if test "${cmd}" = "req" if test "${cmd}" = "req"
then then

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat May 17 14:53:11 UTC 2025 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
- Include the version of the package in the ocamlfind provide entries
-------------------------------------------------------------------
Mon Sep 9 09:09:09 UTC 2024 - ohering@suse.de
- Package also *.vo and *.glob, for Coq
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 31 21:44:55 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net> Tue Oct 31 21:44:55 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package ocaml-rpm-macros # spec file for package ocaml-rpm-macros
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2025 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
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros Name: ocaml-rpm-macros
Version: 20231101 Version: 20250517
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
@@ -80,7 +80,7 @@ _EOF_
attr_sh="%%_rpmconfigdir/${tag}.sh" attr_sh="%%_rpmconfigdir/${tag}.sh"
tee %buildroot${file_sh} < %{SOURCE1} tee %buildroot${file_sh} < %{SOURCE1}
tee %buildroot${file_attr} <<_EOF_ tee %buildroot${file_attr} <<_EOF_
%%__${tag}_provides ${attr_sh} -prov %%__${tag}_provides ${attr_sh} -prov %%version
%%__${tag}_requires ${attr_sh} -req %%__${tag}_requires ${attr_sh} -req
%%__${tag}_path ^%ocaml_standard_library/.*/META$|^%ocaml_standard_library/META$ %%__${tag}_path ^%ocaml_standard_library/.*/META$|^%ocaml_standard_library/META$
_EOF_ _EOF_
@@ -101,7 +101,7 @@ tee %buildroot%_rpmmacrodir/macros.%name <<'_EOF_'
# - Helper applications below %ocaml_standard_library go into the -devel subpackage # - Helper applications below %ocaml_standard_library go into the -devel subpackage
# - License files go into the main package. # - License files go into the main package.
# - To aid debugging of cmxs files, their debuginfo is preserved by removing the executable bit. # - To aid debugging of cmxs files, their debuginfo is preserved by removing the executable bit.
# #
# get rid of %_rpmconfigdir/find-debuginfo.sh # get rid of %_rpmconfigdir/find-debuginfo.sh
# strip kills the bytecode part of ELF binaries # strip kills the bytecode part of ELF binaries
# #
@@ -330,6 +330,14 @@ tee %buildroot%_rpmmacrodir/macros.%name <<'_EOF_'
/\\/[^/]+\\.v$/{\ /\\/[^/]+\\.v$/{\
files_devel($0)\ files_devel($0)\
}\ }\
# Some Coq files\
/\\/[^/]+\\.vo$/{\
files_devel($0)\
}\
# Some Coq files\
/\\/[^/]+\\.glob$/{\
files_devel($0)\
}\
#\ #\
# record unknown paths\ # record unknown paths\
files_unhandled($0)\ files_unhandled($0)\