public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ocaml-cppo] rawhide: OCaml 5.5.0 rebuild
Date: Thu, 09 Jul 2026 16:21:08 GMT [thread overview]
Message-ID: <178361406884.1.14342130396574292571.rpms-ocaml-cppo-d78fc0472ad8@fedoraproject.org> (raw)
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
reply other threads:[~2026-07-09 16:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178361406884.1.14342130396574292571.rpms-ocaml-cppo-d78fc0472ad8@fedoraproject.org \
--to=loganjerry@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox