Sync from SUSE:SLFO:Main ocaml-augeas revision db1d8de2579888831d1294d76c0962a8

caml_named_value-returns-const-value-pointer-in-OCam.patch

@@ -1,35 +0,0 @@
-From 1cf5aef99b26a46529ca797547c0b49627fffe78 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-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
-

ocaml-augeas-0.6.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl1b/RIRHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKCWeA//bU7ozTCLmfRRJk0PpHeMjzLbtMF+2Yh3
-hY9Ey2q9Kt4yoRrneEL4QWL5y87PFjAoabNOtP7bJN36xZYQ66C/GGSmg2DjFPHL
-Ol2FOU7O63auKFsiXt9mDQRO2Mh/Trv+ZJ4cSW/gTpEH4YsSp+70rsfvADQlEWhO
-fYr7A0JPynxhVCM/cOsJ6Dvgtl2Iwb6CJ8a9kqACJQ8KvcFhkrsBiliAo5omlXev
-YjZ/iX1EWIGxeCfOvPpkkP4jBWS28aQqvCQIJ/e3dOOO4W9R0bFz1Xi4I+C7oieV
-Yxqn9DBmLuHw2ZCgxd626RZ5LApOnjH/kz4vkWBSmTrhbAhIcfsgq49iAtw8r14E
-D1NjEIr2NrEkqswdO8ZU8UYv1AgXxIeyFfjcCj0+X3QRpvBzd22SVb+iTLdo//sp
-xDJNCy7QHxKnWS+bAAcK5dHEeYPamqn+B1Veato7rRn0a0yxb328H4YVUv3U/DMN
-UXKz+JKVBI5RjH13K4HWCiUb2shy08q/VnsILxaz4k/v6p0Wm6ub+pVoUFPl98n9
-3VB+ltoAJrI7AoPnkvHWTAm/tQ8ZHepF2fAU8cHMxoOx2HmGka+r3SsG2lepm7k6
-Kqd4K0SchBOSsMzbqoAaq5XIBm/Ieo0+6ZdlvUDfqQq5JLREXsvn4eqQ8a1EnJvV
-d0suVCSUapM=
-=cw0u
------END PGP SIGNATURE-----

ocaml-augeas-0.7.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCgAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmgcdfkRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKAiYg/+LoVkz/ukX/Tq1EBKzuS0HXAHcqdetbg9
+R9jFFOAGLH/r2yyG0wZ5izlLSS6e0b/neTbI8o2IVOQhHfbNvwFoyQlq3Jm9RfYk
+13i939f7kd/QAJjJady1sa5T2Ra9cYdrvYQn7bL/tQ4SMIKRVkfA4DqeDqYTw93s
+q90fPCG1klp6kNEcTYVDpkgecUI8d3lGQ8vwDlmssetWA54JxQh/+ZSSzUZLaaFP
+NQ9Zj6R0GtS4Eo4EVftKs7MViek2LSgUjBAaCIuGoaXAprCgZka1SC58btMd7p0W
+eLYtzIVLv4TEj+qu8XalRUFx8ZVmm9HLT937v0sZFmDjIA9/svPpoCQEGeOa6OYc
++hLp71/LuyfRsF7P/ROomogmubuwv7HeniS/J6DRHt/Xue4XpKA3pXodAZZx3OHS
+pStK0Cpwi2rMBLln7mz/w6B+lUOSQJfZXnMIaKNfh8239445GAC5qOxCHW66SOnm
+aHKo7aJXy3S1OsYaSOB2T/gYw3pc6RFAMwUOeGlj+Nj52kGnR8XjJ+uep6PCVIgz
+EyQO4Fp2z8cJRC8dmLEqGlm8BrwO7gUT6YS54dqkOwNR2Av2oi1vWWxh6xPJQfIy
+JKwDx3MJHXiO2c4LB/7FRjF2DDvQOOijJiopjzeAcXffaGKauAym9yMIXm9UbPpO
+pagaeNycrYY=
+=lFLY
+-----END PGP SIGNATURE-----

ocaml-augeas.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Jun 30 09:31:38 MDT 2025 - carnold@suse.com
+
+- Update License to LGPL-2.1-or-later
+
+-------------------------------------------------------------------
+Fri Jun 13 13:29:14 MDT 2025 - carnold@suse.com
+
+- Update to version 0.7 (jsc#PED-12706)
+  * Use ocamlopt -g option
+  * caml_named_value returns const value pointer in OCaml 4.09+
+  * augeas: Return matches list in order
+  * Update .depend with current ocamldep
+- Drop caml_named_value-returns-const-value-pointer-in-OCam.patch
+
+-------------------------------------------------------------------
+Tue Dec 12 12:12:12 UTC 2023 - ohering@suse.de
+
+- Use ocaml-rpm-macros to track OCaml ABI
+
 -------------------------------------------------------------------
 Thu Feb  9 14:11:01 MST 2023 - carnold@suse.com
 

ocaml-augeas.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml-augeas
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,55 +17,48 @@
 
 
 Name:           ocaml-augeas
-Version:        0.6
+Version:        0.7
 Release:        0
 Summary:        OCaml bindings for Augeas configuration API
-License:        GPL-2.0-or-later
-URL:            http://people.redhat.com/~rjones/augeas/files/
-Source0:        http://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz
+License:        LGPL-2.1-or-later
+URL:            https://download.libguestfs.org/ocaml-augeas/
+Source0:        https://download.libguestfs.org/ocaml-augeas/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}.tar.gz.sig
 Source2:        ocaml-augeas.rpmlintrc
 
-Patch1:         caml_named_value-returns-const-value-pointer-in-OCam.patch
-
+BuildRequires:  augeas-devel >= 0.1.0
+BuildRequires:  chrpath
 BuildRequires:  make
-BuildRequires:  ocaml >= 3.09.0
+BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  augeas-devel >= 0.1.0
-BuildRequires:  chrpath 
+BuildRequires:  ocaml-rpm-macros
 
 %description
 Augeas is a unified system for editing arbitrary configuration
 files. This provides complete OCaml bindings for Augeas.
 
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}
 
-
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
-
 %prep
 %autosetup -p1
 
-
 %build
 %define _lto_cflags %{nil}
 
-%configure 
+%configure
 make all
 make doc
 
-
 %check
 make check
 
-
 %install
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
@@ -75,24 +68,12 @@ ocamlfind install augeas META *.mli *.cmx *.cma *.cmxa *.a augeas.cmi *.so
 
 chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
 
+%ocaml_create_file_list
 
-%files
-%doc COPYING.LIB
-%{_libdir}/ocaml/augeas
-%exclude %{_libdir}/ocaml/augeas/*.a
-%exclude %{_libdir}/ocaml/augeas/*.cmxa
-%exclude %{_libdir}/ocaml/augeas/*.cmx
-%exclude %{_libdir}/ocaml/augeas/*.mli
-%{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
+%files -f %name.files
+%license COPYING.LIB
 
-
-%files devel
+%files devel -f %name.files.devel
 %doc html
-%{_libdir}/ocaml/augeas/*.a
-%{_libdir}/ocaml/augeas/*.cmxa
-%{_libdir}/ocaml/augeas/*.cmx
-%{_libdir}/ocaml/augeas/*.mli
-
 
 %changelog