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-ocp-indent] rawhide: OCaml 5.5.0 rebuild
Date: Thu, 09 Jul 2026 22:20:15 GMT [thread overview]
Message-ID: <178363561528.1.9625104868981343134.rpms-ocaml-ocp-indent-150e5f9a22f1@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ocaml-ocp-indent
Branch : rawhide
Commit : 150e5f9a22f1c0c2db72efbb0b9300cbd768ab27
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-09T16:20:01-06:00
Stats : +76/-13 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/ocaml-ocp-indent/c/150e5f9a22f1c0c2db72efbb0b9300cbd768ab27?branch=rawhide
Log:
OCaml 5.5.0 rebuild
- Use the dune declarative buildsystem
- Fix a test that fails on filesystems with security contexts
---
diff --git a/ocaml-ocp-indent-security-context.patch b/ocaml-ocp-indent-security-context.patch
new file mode 100644
index 0000000..05d9f54
--- /dev/null
+++ b/ocaml-ocp-indent-security-context.patch
@@ -0,0 +1,63 @@
+--- ocp-indent-1.9.0/tests/inplace/run.t.orig 2025-10-01 07:20:33.000000000 -0600
++++ ocp-indent-1.9.0/tests/inplace/run.t 2026-07-06 07:16:00.070468216 -0600
+@@ -11,12 +11,12 @@ ocp-indent -i:
+
+ $ chmod +x target.ml
+ $ ls -l target.ml | awk '{print $1}'
+- -rwxr-xr-x
++ -rwxr-xr-x.
+
+ $ ocp-indent -i target.ml
+
+ $ ls -l target.ml | awk '{print $1}'
+- -rwxr-xr-x
++ -rwxr-xr-x.
+
+ $ cat target.ml
+ let x =
+@@ -39,16 +39,16 @@ to link.ml but to the link target and bo
+ preserved:
+
+ $ ls -l link.ml | awk '{print $1, $(NF-2), $(NF-1), $NF}'
+- lrwxrwxrwx link.ml -> target.ml
++ lrwxrwxrwx. link.ml -> target.ml
+ $ ls -l target.ml | awk '{print $1, $NF}'
+- -rw-r--r-- target.ml
++ -rw-r--r--. target.ml
+
+ $ ocp-indent -i link.ml
+
+ $ ls -l link.ml | awk '{print $1, $(NF-2), $(NF-1), $NF}'
+- lrwxrwxrwx link.ml -> target.ml
++ lrwxrwxrwx. link.ml -> target.ml
+ $ ls -l target.ml | awk '{print $1, $NF}'
+- -rw-r--r-- target.ml
++ -rw-r--r--. target.ml
+
+ $ cat target.ml
+ let x =
+@@ -66,18 +66,18 @@ The above properties should hold, no mat
+ $ ln -s link.ml link2.ml
+
+ $ ls -l link*.ml | awk '{print $1, $(NF-2), $(NF-1), $NF}'
+- lrwxrwxrwx link.ml -> target.ml
+- lrwxrwxrwx link2.ml -> link.ml
++ lrwxrwxrwx. link.ml -> target.ml
++ lrwxrwxrwx. link2.ml -> link.ml
+ $ ls -l target.ml | awk '{print $1, $NF}'
+- -rw-r--r-- target.ml
++ -rw-r--r--. target.ml
+
+ $ ocp-indent -i link2.ml
+
+ $ ls -l link*.ml | awk '{print $1, $(NF-2), $(NF-1), $NF}'
+- lrwxrwxrwx link.ml -> target.ml
+- lrwxrwxrwx link2.ml -> link.ml
++ lrwxrwxrwx. link.ml -> target.ml
++ lrwxrwxrwx. link2.ml -> link.ml
+ $ ls -l target.ml | awk '{print $1, $NF}'
+- -rw-r--r-- target.ml
++ -rw-r--r--. target.ml
+
+ $ cat target.ml
+ let x =
diff --git a/ocaml-ocp-indent.spec b/ocaml-ocp-indent.spec
index 03ec418..9e69012 100644
--- a/ocaml-ocp-indent.spec
+++ b/ocaml-ocp-indent.spec
@@ -1,11 +1,8 @@
-# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
-ExcludeArch: %{ix86}
-
%global giturl https://github.com/OCamlPro/ocp-indent
Name: ocaml-ocp-indent
Version: 1.9.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A simple tool to indent OCaml programs
# The entire source code is LGPL with the OCaml linking exception except
@@ -17,7 +14,13 @@ Source: %{giturl}/archive/%{version}/ocp-indent-%{version}.tar.gz
# Fix use of ISO8859-1 characters at the beginnings of lines
# https://github.com/OCamlPro/ocp-indent/issues/318
Patch: %{name}-nonbreaking-space.patch
+# Fix a test that fails because files in mock builds have security contexts
+Patch: %{name}-security-context.patch
+
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
+BuildSystem: dune
BuildRequires: emacs-nw
BuildRequires: emacs-tuareg
BuildRequires: ocaml
@@ -56,11 +59,7 @@ developing applications that use %{name}.
%prep
%autosetup -n ocp-indent-%{version} -p1
-%build
-%dune_build
-
-%install
-%dune_install
+%install -a
sed -i '\@%{_datadir}/ocp-indent@d' .ofiles .ofiles-devel
# Reinstall vim files to Fedora default location
@@ -77,10 +76,6 @@ mv ocp-indent-loaddefs.el %{buildroot}%{_emacs_sitestartdir}
%_emacs_bytecompile ocp-indent.el
cd -
-%check
-#Tests only run on a git checkout
-# ./tests/test.sh
-
%files -f .ofiles
%doc README.md CHANGELOG.md
%license LICENSE
@@ -91,6 +86,11 @@ cd -
%files devel -f .ofiles-devel
%changelog
+* Wed Jul 08 2026 Jerry James <loganjerry@gmail.com> - 1.9.0-5
+- OCaml 5.5.0 rebuild
+- Use the dune declarative buildsystem
+- Fix a test that fails on filesystems with security contexts
+
* Sat Feb 21 2026 Richard W.M. Jones <rjones@redhat.com> - 1.9.0-4
- OCaml 5.4.1 rebuild
reply other threads:[~2026-07-09 22:20 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=178363561528.1.9625104868981343134.rpms-ocaml-ocp-indent-150e5f9a22f1@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