diff --git a/.gitignore b/.gitignore index 3cfc1a3..19e8062 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -ocaml-augeas-0.4.tar.gz -/ocaml-augeas-0.5.tar.gz -/ocaml-augeas-0.6.tar.gz +/ocaml-augeas-*.tar.gz +/ocaml-augeas-*.tar.gz.sig diff --git a/0001-Use-ocamlopt-g-option.patch b/0001-Use-ocamlopt-g-option.patch deleted file mode 100644 index be46e09..0000000 --- a/0001-Use-ocamlopt-g-option.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 56c0602e972f1fae336198eb9587d71f1e36daff Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 20 Aug 2019 15:06:57 +0100 -Subject: [PATCH 1/2] Use ocamlopt -g option. - -Originally from Fedora. ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index e01385f..4ae5ef5 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -34,8 +34,8 @@ LIBS = @AUGEAS_LIBS@ @LIBXML2_LIBS@ @LIBS@ - - OCAMLCFLAGS = -g - OCAMLCPACKAGES = --OCAMLOPTFLAGS = --OCAMLOPTPACKAGES = -+OCAMLOPTFLAGS = $(OCAMLCFLAGS) -+OCAMLOPTPACKAGES = $(OCAMLCPACKAGES) - - OCAMLDOCFLAGS = -html -sort - --- -2.23.0 - diff --git a/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch b/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch deleted file mode 100644 index 22c5ed9..0000000 --- a/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1cf5aef99b26a46529ca797547c0b49627fffe78 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 7 Dec 2019 11:08:54 +0000 -Subject: [PATCH 2/2] caml_named_value returns const value pointer in OCaml - 4.09+ - ---- - augeas-c.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/augeas-c.c b/augeas-c.c -index 9217017..679bcb5 100644 ---- a/augeas-c.c -+++ b/augeas-c.c -@@ -86,7 +86,7 @@ static const int error_map_len = sizeof error_map / sizeof error_map[0]; - static void - raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle) - { -- value *exn = caml_named_value ("Augeas.Error"); -+ const value *exn = caml_named_value ("Augeas.Error"); - value args[5]; - const int code = aug_error (t); - const char *aug_err_msg; -@@ -132,7 +132,7 @@ raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle) - static void - raise_init_error (const char *msg) - { -- value *exn = caml_named_value ("Augeas.Error"); -+ const value *exn = caml_named_value ("Augeas.Error"); - value args[5]; - - args[0] = caml_alloc (1, 0); --- -2.23.0 - diff --git a/libguestfs.keyring b/libguestfs.keyring new file mode 100644 index 0000000..bb3eb55 Binary files /dev/null and b/libguestfs.keyring differ diff --git a/ocaml-augeas.spec b/ocaml-augeas.spec index 1d9911a..656a862 100644 --- a/ocaml-augeas.spec +++ b/ocaml-augeas.spec @@ -2,18 +2,15 @@ ExcludeArch: %{ix86} Name: ocaml-augeas -Version: 0.6 -Release: 37%{?dist} +Version: 0.7 +Release: 1%{?dist} Summary: OCaml bindings for Augeas configuration API License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception -URL: https://people.redhat.com/~rjones/augeas/files/ -Source0: https://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz - -# Upstream patch to enable debuginfo. -Patch1: 0001-Use-ocamlopt-g-option.patch -# Const-correctness fix for OCaml 4.09+ -Patch2: 0002-caml_named_value-returns-const-value-pointer-in-OCam.patch +URL: https://people.redhat.com/~rjones/augeas/ +Source0: https://download.libguestfs.org/ocaml-augeas/ocaml-augeas-%{version}.tar.gz +Source1: https://download.libguestfs.org/ocaml-augeas/ocaml-augeas-%{version}.tar.gz.sig +Source2: libguestfs.keyring BuildRequires: make BuildRequires: ocaml >= 3.09.0 @@ -21,6 +18,7 @@ BuildRequires: ocaml-findlib BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-rpm-macros BuildRequires: augeas-devel >= 0.1.0 +BuildRequires: gnupg2 %description @@ -39,6 +37,7 @@ developing applications that use %{name}. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 # Pass -g to ocamlmklib @@ -48,6 +47,7 @@ sed -i 's/ocamlmklib/& -g/' Makefile.in %build %configure %ifarch %{ocaml_native_compiler} +# _smp_mflags breaks the build. make %else make mlaugeas.cma test_augeas @@ -85,6 +85,12 @@ ocamlfind install augeas META *.mli *.cma *.a augeas.cmi *.so %changelog +* Thu May 08 2025 Richard W.M. Jones - 0.7-1 +- New upstream version 0.7 +- New download URL +- Check GPG signature + resolves: RHEL-90257 + * Wed Oct 30 2024 Troy Dawson - 0.6-37 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index f55c17d..2a82037 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (ocaml-augeas-0.6.tar.gz) = e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a +SHA512 (ocaml-augeas-0.7.tar.gz) = 2d1ef07f116abf04d74ae4bb2b9c088fd69b1d46509b684fdad454deeca554bbf737346b115976f2f7a29851a3f5186ef0479197412684a83fcd60286e6ae3ec +SHA512 (ocaml-augeas-0.7.tar.gz.sig) = 5834ea0cd1a991f08b6c61c783cad7c9e9aaf5a3d0ac86ac8e9609353daf43b9a9fab9df2241b5f5aee225358ab89dfd7e0a579b044d01b2e2007fc4be50ee92 diff --git a/tests/tests.yml b/tests/tests.yml index 68d1d0a..620490e 100755 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -7,6 +7,7 @@ - ocaml - ocaml-findlib - ocaml-augeas-devel + - augeas-devel tests: - simple: dir: .