public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ocaml-cppo] rawhide: OCaml 5.5.0 rebuild
@ 2026-07-09 16:21 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-09 16:21 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/ocaml-cppo
            Branch : rawhide
            Commit : d78fc0472ad80c0a46b39e0f35b2acddbbf0344c
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-09T10:20:54-06:00
            Stats  : +22/-15 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-cppo/c/d78fc0472ad80c0a46b39e0f35b2acddbbf0344c?branch=rawhide

            Log:
            OCaml 5.5.0 rebuild

- Add patch for compatibility with previous dune versions
- Drop unused ocaml-findlib BR

---
diff --git a/ocaml-cppo-dune-3.24.patch b/ocaml-cppo-dune-3.24.patch
new file mode 100644
index 0000000..541869d
--- /dev/null
+++ b/ocaml-cppo-dune-3.24.patch
@@ -0,0 +1,11 @@
+--- cppo-1.8.0/src/cppo_lexer.mll.orig	2024-12-03 01:52:33.000000000 -0700
++++ cppo-1.8.0/src/cppo_lexer.mll	2026-06-25 14:47:17.546944104 -0600
+@@ -834,7 +834,7 @@ and shapes shs = parse
+ 
+ {
+   let init ~preserve_quotations file lexbuf =
+-    new_file lexbuf file;
++    new_file lexbuf (Filename.basename file);
+     {
+       preserve_quotations = preserve_quotations;
+       lexer = `Ocaml;

diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec
index 90a276f..3dca121 100644
--- a/ocaml-cppo.spec
+++ b/ocaml-cppo.spec
@@ -5,17 +5,20 @@ ExcludeArch: %{ix86}
 
 Name:           ocaml-cppo
 Version:        1.8.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Equivalent of the C preprocessor for OCaml programs
 
 License:        BSD-3-Clause
 URL:            https://ocaml-community.github.io/cppo/
 VCS:            git:%{giturl}.git
 Source0:        %{giturl}/archive/v%{version}/cppo-%{version}.tar.gz
+# Path representation changed in dune 3.24
+# Restore compatibility with previous versions
+Patch:          %{name}-dune-3.24.patch
 
+BuildSystem:    dune
 BuildRequires:  ocaml >= 4.02.3
 BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamlbuild
 
 %description
@@ -47,19 +50,7 @@ at build time.  To use it, call ocamlbuild with the argument
 
 
 %prep
-%autosetup -n cppo-%{version}
-
-
-%build
-%dune_build
-
-
-%install
-%dune_install
-
-
-%check
-%dune_check
+%autosetup -n cppo-%{version} -p1
 
 
 %files
@@ -74,6 +65,11 @@ at build time.  To use it, call ocamlbuild with the argument
 
 
 %changelog
+* Thu Jul 09 2026 Jerry James <loganjerry@gmail.com> - 1.8.0-8
+- OCaml 5.5.0 rebuild
+- Add patch for compatibility with previous dune versions
+- Drop unused ocaml-findlib BR
+
 * Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-7
 - OCaml 5.4.1 rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-09 16:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-09 16:21 [rpms/ocaml-cppo] rawhide: OCaml 5.5.0 rebuild Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox