[rpms/frama-c] rawhide: OCaml 5.5.0 rebuild

[rpms/frama-c] rawhide: OCaml 5.5.0 rebuild

[Jerry James]

            A new commit has been pushed.

            Repo   : rpms/frama-c
            Branch : rawhide
            Commit : 933339cd7f2ec9f95fb628507667f2797ed9b3d9
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-10T09:24:07-06:00
            Stats  : +75/-14 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/frama-c/c/933339cd7f2ec9f95fb628507667f2797ed9b3d9?branch=rawhide

            Log:
            OCaml 5.5.0 rebuild

- Use the dune declarative buildsystem
- Add patches to fix tests with dune 3.24

---
diff --git a/frama-c-test-spaces.patch b/frama-c-test-spaces.patch
new file mode 100644
index 0000000..24e03d8
--- /dev/null
+++ b/frama-c-test-spaces.patch
@@ -0,0 +1,50 @@
+--- frama-c-32.1-Germanium/src/plugins/alias/tests/fixed_bugs/oracle/void_ptr.res.oracle.orig	2026-03-15 18:00:00.000000000 -0600
++++ frama-c-32.1-Germanium/src/plugins/alias/tests/fixed_bugs/oracle/void_ptr.res.oracle	2026-07-09 19:47:33.916685337 -0600
+@@ -46,8 +46,8 @@
+     enter_dir_ad.fts_ent }
+   { (fts_read_sp.ht)->bucket.data; enter_dir_entry }
+ [alias] analysing instruction: struct _ftsent *tmp = fts_read_sp_0->fts_link;
+-[alias] May-aliases after instruction
+-  struct _ftsent *tmp = fts_read_sp_0->fts_link;  are
++[alias] May-aliases after instruction  struct _ftsent *tmp = fts_read_sp_0->fts_link;
++  are
+   { ((struct Active_dir *)(fts_read_sp.ht)->bucket.data)->fts_ent;
+     ((struct Active_dir *)enter_dir_entry)->fts_ent; fts_read_sp_0;
+     enter_dir_ad.fts_ent }
+--- frama-c-32.1-Germanium/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle.orig	2026-03-15 18:00:00.000000000 -0600
++++ frama-c-32.1-Germanium/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle	2026-07-09 17:42:37.054109439 -0600
+@@ -33,8 +33,8 @@
+ [alias] May-aliases after instruction  z1->c = a;  are  { z1->c; a }
+ [alias] analysing instruction: t->t = (struct struct_2_t *)z1;
+ [alias] May-aliases after instruction  t->t = (struct struct_2_t *)z1;  are
+-  { (t->t)->s[0..]; z1->s[0..] }  { (t->t)->s; z1->s }
+-  { (t->t)->c; z1->c; a }  { t->t; z1 }
++  { (t->t)->s[0..]; z1->s[0..] }  { (t->t)->s; z1->s }  { (t->t)->c; z1->c; a }
++  { t->t; z1 }
+ [alias] analysing instruction: t->d = a;
+ [alias] May-aliases after instruction  t->d = a;  are
+   { (t->t)->s[0..]; z1->s[0..] }  { (t->t)->s; z1->s }
+--- frama-c-32.1-Germanium/src/plugins/alias/tests/real_world/oracle/nested_calls.res.oracle.orig	2026-03-15 18:00:00.000000000 -0600
++++ frama-c-32.1-Germanium/src/plugins/alias/tests/real_world/oracle/nested_calls.res.oracle	2026-07-09 17:43:46.492536847 -0600
+@@ -24,8 +24,8 @@
+ [alias] May-aliases after global variable definition  E_invalid_user  are
+   { E_invalid_user; "" }
+ [alias] analysing global variable definition: change_file_owner_tmp___11 = {};
+-[alias] May-aliases after global variable definition  change_file_owner_tmp___11
+-  are  { E_invalid_user; "" }
++[alias] May-aliases after global variable definition  change_file_owner_tmp___11  are
++  { E_invalid_user; "" }
+ [alias] analysing global variable definition: __fc_lit_string2 = "";
+ [alias] May-aliases after global variable definition  __fc_lit_string2  are
+   { E_invalid_user; "" }
+@@ -791,8 +791,8 @@
+ [alias] analysing instruction: xstrtoul();
+ [alias] analysing function: xstrtoul
+ [alias] analysing instruction: strtol_error __constr_expr_0 = {.x = (char)0};
+-[alias] May-aliases after instruction
+-  strtol_error __constr_expr_0 = {.x = (char)0};  are
++[alias] May-aliases after instruction  strtol_error __constr_expr_0 = {.x = (char)0};
++  are
+   { E_invalid_user; "" }  { E_invalid_group; "" }  { E_bad_spec; "" }
+   { quoting_style_args[0..]; ""; ""; ""; ""; ""; ""; ""; "" }  { Version; "" }
+ [alias] May-aliases at the end of function xstrtoul:

diff --git a/frama-c-tests.patch b/frama-c-tests.patch
new file mode 100644
index 0000000..5e76ed8
--- /dev/null
+++ b/frama-c-tests.patch
@@ -0,0 +1,13 @@
+--- frama-c-32.1-Germanium/share/Makefile.testing.orig	2026-03-15 18:00:00.000000000 -0600
++++ frama-c-32.1-Germanium/share/Makefile.testing	2026-07-09 17:09:16.112495174 -0600
+@@ -205,8 +205,8 @@ endif # PTEST_USE_WP_CACHE
+ 
+ .PHONY: default-tests
+ default-tests: run-ptests
+-	dune build @ptests_config
+-	dune runtest tests
++	dune build --release @ptests_config
++	dune runtest --release tests
+ 	$(MAKE) count-tests
+ 
+ .PHONY: count-tests

diff --git a/frama-c.spec b/frama-c.spec
index aea63e2..c4da5ee 100644
--- a/frama-c.spec
+++ b/frama-c.spec
@@ -1,6 +1,3 @@
-# Coq's plugin architecture requires cmxs files, so:
-ExclusiveArch: %{ocaml_native_compiler}
-
 # Without this, gcc flags are passed to frama-c in the test suite
 %undefine _auto_set_build_flags
 
@@ -44,6 +41,16 @@ Patch:          %{name}-mathlib.patch
 # Work around a change in dune behavior
 Patch:          %{name}-dune-bug.patch
 
+# Run tests in release mode to avoid turning warnings into errors
+Patch:          %{name}-tests.patch
+
+# Adapt to differences in the position of spaces in the tests
+Patch:          %{name}-test-spaces.patch
+
+# Coq's plugin architecture requires cmxs files, so:
+ExclusiveArch:  %{ocaml_native_compiler}
+
+BuildSystem:    dune
 BuildRequires:  alt-ergo
 BuildRequires:  clang
 BuildRequires:  desktop-file-utils
@@ -75,14 +82,10 @@ BuildRequires:  ocaml-yojson-devel >= 2.0.1
 BuildRequires:  ocaml-zarith-devel >= 1.13
 BuildRequires:  ocaml-zip-devel
 BuildRequires:  ocaml-zmq-devel
-BuildRequires:  pandoc
 BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist jsonschema}
-BuildRequires:  %{py3_dist pyyaml}
 BuildRequires:  time
 BuildRequires:  unix2dos
 BuildRequires:  why3
-BuildRequires:  yq
 BuildRequires:  z3
 
 Requires:       alt-ergo
@@ -156,12 +159,7 @@ sed -ri 's/^CP[[:blank:]]+=.*/& -p/' share/Makefile.common
 %py3_shebang_fix tests/libc
 %py3_shebang_fix tests/syntax/cpp-command.t
 
-%build
-%dune_build
-
-%install
-%dune_install
-
+%install -a
 # Two of the man pages are duplicates, so make one a link to the other.
 cat > %{buildroot}%{_mandir}/man1/frama-c-gui.1 << EOF
 .so man1/frama-c.1
@@ -225,8 +223,8 @@ fi
 
 # FIXME: tests fail on ppc6le due to redefinition of bool
 # FIXME: test issue-eacsl-40.1.exec.wtests fails on aarch64
-%ifarch %{x86_64}
 %check
+%ifarch %{x86_64}
 # Skip a broken test for now
 rm -fr tests/fc_script/make-machdep.t
 sed -i '10,+4d' tests/fc_script/dune