From bd6a91d982a9090b23c778a6f3ee17332482f1b4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:57:11 +0100 Subject: [PATCH] fix for missing version in dune-project [release 7.5.0-2mamba;Sun Jul 09 2023] --- ocaml-pcre-7.5.0-dune-missing-version.patch | 8 +++++++ ocaml-pcre.spec | 25 +++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 ocaml-pcre-7.5.0-dune-missing-version.patch diff --git a/ocaml-pcre-7.5.0-dune-missing-version.patch b/ocaml-pcre-7.5.0-dune-missing-version.patch new file mode 100644 index 0000000..79733f9 --- /dev/null +++ b/ocaml-pcre-7.5.0-dune-missing-version.patch @@ -0,0 +1,8 @@ +--- pcre-ocaml-7.5.0/dune-project.orig 2023-07-09 12:06:12.378107809 +0200 ++++ pcre-ocaml-7.5.0/dune-project 2023-07-09 12:06:27.920031121 +0200 +@@ -1,4 +1,5 @@ + (lang dune 2.7) ++(version %VERSION%) + (name pcre) + + (generate_opam_files true) diff --git a/ocaml-pcre.spec b/ocaml-pcre.spec index 969a0b1..1d0221f 100644 --- a/ocaml-pcre.spec +++ b/ocaml-pcre.spec @@ -1,6 +1,6 @@ Name: ocaml-pcre -Version: 7.4.6 -Release: 1mamba +Version: 7.5.0 +Release: 2mamba Summary: Perl Compatibility Regular Expressions for OCaml Group: System/Libraries Vendor: openmamba @@ -8,6 +8,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://mmottl.github.io/pcre-ocaml/ Source: https://github.com/mmottl/pcre-ocaml.git/%{version}/pcre-ocaml-%{version}.tar.bz2 +Patch0: ocaml-pcre-7.5.0-dune-missing-version.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -15,6 +16,7 @@ BuildRequires: libpcre-devel BuildRequires: ocaml BuildRequires: ocaml-runtime ## AUTOBUILDREQ-END +BuildRequires: ocaml >= 4.14.1 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib BuildRequires: dune @@ -41,6 +43,8 @@ This package includes the %{name} API documentation. %prep %setup -q -n pcre-ocaml-%{version} +%patch0 -p1 +sed -i "s|%%VERSION%|%{version}|" dune-project %build dune build @@ -49,10 +53,12 @@ dune build [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" dune install \ --destdir=%{buildroot} \ + --prefix=%{_prefix} \ + --etcdir=%{_sysconfdir} \ + --mandir=%{_mandir} \ + --docdir=%{_docdir} \ --libdir=%{_libdir}/ocaml -rm -r %{buildroot}%{_prefix}/doc - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -81,8 +87,19 @@ rm -r %{buildroot}%{_prefix}/doc %files apidocs %defattr(-,root,root) %doc examples/ +%dir %{_datadir}/doc/pcre +%{_datadir}/doc/pcre/* %changelog +* Sun Jul 09 2023 Silvan Calarco 7.5.0-2mamba +- fix for missing version in dune-project + +* Thu Jul 06 2023 Automatic Build System 7.5.0-1mamba +- automatic version update by autodist + +* Thu Jul 06 2023 Sdk Build System 7.4.6-2mamba +- rebuilt with ocaml 4.14.1 + * Tue May 04 2021 Silvan Calarco 7.4.6-1mamba - update to 7.4.6