diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes index 63cd1af..b48135c 100644 --- a/ocaml-rpm-macros.changes +++ b/ocaml-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 9 09:09:09 UTC 2021 - ohering@suse.de + +- Fix regex in file list generator to really match dot and extension + ------------------------------------------------------------------- Thu Jan 21 21:21:21 UTC 2021 - ohering@suse.de diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec index f0389f7..259ccf1 100644 --- a/ocaml-rpm-macros.spec +++ b/ocaml-rpm-macros.spec @@ -17,7 +17,7 @@ Name: ocaml-rpm-macros -Version: 20210121 +Version: 20210209 Release: 0 Summary: RPM macros for building OCaml source packages License: GPL-2.0-only @@ -229,79 +229,79 @@ tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_' files_devel($0)\ }\ # stub ELF library\ - /\\/[^/]+\.so$/{\ + /\\/[^/]+\\.so$/{\ files_ldconf($0)\ }\ # stub ELF library\ - /\\/[^/]+\.so.owner$/{\ + /\\/[^/]+\\.so.owner$/{\ files_ldconf($0)\ }\ # ELF archive with object files\ - /\\/[^/]+\.a$/{\ + /\\/[^/]+\\.a$/{\ files_devel($0)\ }\ # OCaml legacy source code annotations, produced via -annot\ - /\\/[^/]+\.annot$/{\ + /\\/[^/]+\\.annot$/{\ files_devel($0)\ }\ # OCaml library file with bytecode\ - /\\/[^/]+\.cma$/{\ + /\\/[^/]+\\.cma$/{\ files_devel($0)\ }\ # OCaml compiled header file\ - /\\/[^/]+\.cmi$/{\ + /\\/[^/]+\\.cmi$/{\ files_devel($0)\ }\ # OCaml object file with bytecode\ - /\\/[^/]+\.cmo$/{\ + /\\/[^/]+\\.cmo$/{\ files_devel($0)\ }\ # OCaml source code annotations, produced via -bin-annot from source files\ - /\\/[^/]+\.cmt$/{\ + /\\/[^/]+\\.cmt$/{\ files_devel($0)\ }\ # OCaml source code annotations, produced via -bin-annot from header files\ - /\\/[^/]+\.cmti$/{\ + /\\/[^/]+\\.cmti$/{\ files_devel($0)\ }\ # OCaml object file with native code\ - /\\/[^/]+\.cmx$/{\ + /\\/[^/]+\\.cmx$/{\ files_devel($0)\ }\ # OCaml library file with native code\ - /\\/[^/]+\.cmxa$/{\ + /\\/[^/]+\\.cmxa$/{\ files_devel($0)\ }\ # ELF shared library with native code\ - /\\/[^/]+\.cmxs$/{\ + /\\/[^/]+\\.cmxs$/{\ files_devel($0)\ }\ # Some helper binary\ - /\\/[^/]+\.exe$/{\ + /\\/[^/]+\\.exe$/{\ files_devel($0)\ }\ # C header\ - /\\/[^/]+\.h$/{\ + /\\/[^/]+\\.h$/{\ files_devel($0)\ }\ #\ - /\\/[^/]+\.js$/{\ + /\\/[^/]+\\.js$/{\ files_devel($0)\ }\ # OCaml source code, source file\ - /\\/[^/]+\.ml$/{\ + /\\/[^/]+\\.ml$/{\ files_devel($0)\ }\ # OCaml source code, header file\ - /\\/[^/]+\.mli$/{\ + /\\/[^/]+\\.mli$/{\ files_devel($0)\ }\ # ELF object file\ - /\\/[^/]+\.o$/{\ + /\\/[^/]+\\.o$/{\ files_devel($0)\ }\ #\ - /\\/[^/]+\.sml$/{\ + /\\/[^/]+\\.sml$/{\ files_devel($0)\ }\ # generated by dune\ @@ -313,7 +313,7 @@ tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_' files_devel($0)\ }\ # Some Coq files\ - /\\/[^/]+\.v$/{\ + /\\/[^/]+\\.v$/{\ files_devel($0)\ }\ #\