Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

- Drop upstreamed fix for arm64 frame pointers
- Reenable LTO
- Move ld.conf, libasmrun, and libcamlrun to ocaml-runtime
- Drop hardlink dependency; rpm now does this by default
- Drop unused utilx-linux dependency

0001-Don-t-add-rpaths-to-libraries.patch

@@ -1,4 +1,4 @@
-From 507a1382cb82160c2a6cfc0ea5bcb3e33ece7307 Mon Sep 17 00:00:00 2001
+From 04e523e937625bf30d775681c11e00f6dc6fc00a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 24 Jun 2014 10:00:15 +0100
 Subject: [PATCH 1/2] Don't add rpaths to libraries.
@@ -8,10 +8,10 @@ Subject: [PATCH 1/2] Don't add rpaths to libraries.
  1 file changed, 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0c9d63859a..48aa9f0a29 100644
+index 3754ad8a39..fb60c7c14c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1221,8 +1221,6 @@ AS_IF([test x"$enable_shared" != "xno"],
+@@ -1422,8 +1422,6 @@ AS_IF([test x"$enable_shared" != "xno"],
           [[*-*-openbsd7.[3-9]|*-*-openbsd[89].*]],
             [mkdll_flags="${mkdll_flags} -Wl,--no-execute-only"])
        oc_ldflags="$oc_ldflags -Wl,-E"
@@ -21,5 +21,5 @@ index 0c9d63859a..48aa9f0a29 100644
        supports_shared_libraries=true],
        [mkdll='shared-libs-not-available'])
 -- 
-2.44.0
+2.52.0
 

0002-configure-Allow-user-defined-C-compiler-flags.patch

@@ -1,28 +1,17 @@
-From edd903fc73b98eb784b307a47110985967cb1d09 Mon Sep 17 00:00:00 2001
+From ef549c9a97838331877b139f407269db2a0fc691 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 29 May 2012 20:44:18 +0100
 Subject: [PATCH 2/2] configure: Allow user defined C compiler flags.
 
 ---
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 48aa9f0a29..fc29c88f50 100644
+index fb60c7c14c..f6a493ccf5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -925,6 +925,10 @@ AS_CASE([$ocaml_cc_vendor],
-     internal_cflags="$cc_warnings"],
-   [common_cflags="-O"])
- 
-+# Allow CFLAGS and LDFLAGS to be added.
-+common_cflags="$common_cflags $CFLAGS"
-+cclibs="$cclibs $LDFLAGS"
-+
- # Enable SSE2 on x86 mingw to avoid using 80-bit registers.
- AS_CASE([$host],
-   [i686-*-mingw32*],
-@@ -2708,7 +2712,7 @@ AC_CONFIG_COMMANDS_PRE([
+@@ -3243,7 +3243,7 @@ AC_CONFIG_COMMANDS_PRE([
        [mkexedebugflag="${mkexe_ldflags_prefix}${mkexedebugflag}"])
      mkdll_ldflags=""
      AS_IF([test -n "${LDFLAGS}"],
@@ -32,4 +21,5 @@ index 48aa9f0a29..fc29c88f50 100644
        done
        mkdll_ldflags_exp="$mkdll_ldflags"])
 -- 
-2.44.0
+2.52.0
+

ocaml.spec

@@ -1,13 +1,6 @@
 # Don't add -Wl,-dT,<build dir>
 %undefine _package_note_flags
 
-# OCaml 5.1 broke building with LTO.  A file prims.c is generated with
-# primitive function declarations, all with "void" for their parameter
-# list.  This does not match the real definitions, leading to lots of
-# -Wlto-type-mismatch warnings.  These change the output of the tests,
-# leading to many failed tests.  This is still a problem in 5.3.
-%global _lto_cflags %{nil}
-
 # OCaml has a bytecode backend that works on anything with a C
 # compiler, and a native code backend available on a subset of
 # architectures.  A further subset of architectures support native
@@ -32,7 +25,7 @@ ExcludeArch: %{ix86}
 
 # These are all the architectures that the tests run on.  The tests
 # take a long time to run, so don't run them on slow machines.
-%global test_arches aarch64 %{power64} riscv64 s390x x86_64
+%global test_arches %{arm64} %{power64} %{riscv64} s390x %{x86_64}
 # These are the architectures for which the tests must pass otherwise
 # the build will fail.
 #global test_arches_required aarch64 ppc64le x86_64
@@ -45,7 +38,7 @@ ExcludeArch: %{ix86}
 %global rcver %{nil}
 
 Name:           ocaml
-Version:        5.3.0
+Version:        5.5.0
 Release:        2%{?dist}
 
 Summary:        OCaml compiler and programming environment
@@ -68,7 +61,7 @@ Source2:        ocaml_files.py
 #
 # https://pagure.io/fedora-ocaml
 #
-# Current branch: fedora-41-5.2.0
+# Current branch: fedora-45-5.4.1
 #
 # ALTERNATIVELY add a patch to the end of the list (leaving the
 # existing patches unchanged) adding a comment to note that it should
@@ -83,15 +76,12 @@ BuildRequires:  git-core
 BuildRequires:  gcc
 BuildRequires:  autoconf
 BuildRequires:  gawk
-BuildRequires:  hardlink
 BuildRequires:  perl-interpreter
-BuildRequires:  util-linux
-BuildRequires:  /usr/bin/annocheck
+BuildRequires:  annobin-annocheck
 BuildRequires:  pkgconfig(libzstd)
 
 # Documentation requirements
 BuildRequires:  asciidoc
-BuildRequires:  python3-pygments
 
 # ocamlopt runs gcc to link binaries.  Because Fedora includes
 # hardening flags automatically, redhat-rpm-config is also required.
@@ -111,9 +101,6 @@ Requires:       ocaml-runtime%{?_isa} = %{version}-%{release}
 BuildRequires:  ocaml-srpm-macros >= 10
 Requires:       ocaml-srpm-macros >= 10
 
-# Bundles an MD5 implementation in runtime/caml/md5.h and runtime/md5.c
-Provides:       bundled(md5-plumb)
-
 Provides:       ocaml(compiler) = %{version}
 
 %if %{native_compiler}
@@ -139,9 +126,11 @@ and a comprehensive library.
 #   and runtime/md5.c
 License:        LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception AND LicenseRef-Fedora-Public-Domain
 Summary:        OCaml runtime environment
-Requires:       util-linux
 Provides:       ocaml(runtime) = %{version}
 
+# Bundles an MD5 implementation in runtime/caml/md5.h and runtime/md5.c
+Provides:       bundled(md5-plumb)
+
 %description runtime
 OCaml is a high-level, strongly-typed, functional and object-oriented
 programming language from the ML family of languages.
@@ -259,7 +248,7 @@ sed -i '/^EXTRACAMLFLAGS=/aLINKOPTS=-cclib -lm' otherlibs/unix/Makefile
     --disable-native-compiler \
     --disable-native-toplevel \
 %endif
-%ifarch x86_64
+%ifarch %{x86_64} %{arm64}
 %if 0%{?_include_frame_pointers}
     --enable-frame-pointers \
 %endif
@@ -307,7 +296,10 @@ make -j1 tests ||:
 
 %install
 %make_install
-perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
+
+# OCaml 5.5.0 uses relative paths in ld.conf by default to support relocatable
+# OCaml, which we don't need.  Overwrite ld.conf with the absolute path.
+echo %{_libdir}/ocaml/stublibs > $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
 
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
@@ -320,9 +312,6 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{rpmmacrodir}/macros.ocaml-rpm
 mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/redhat
 
-# Link, rather than copy, identical binaries
-hardlink -t $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-
 
 %files
 %license LICENSE
@@ -365,7 +354,6 @@ hardlink -t $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 %endif
 
 %{_libdir}/ocaml/expunge
-%{_libdir}/ocaml/ld.conf
 %{_libdir}/ocaml/Makefile.config
 
 %{_libdir}/ocaml/*.a
@@ -373,11 +361,9 @@ hardlink -t $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 %{_libdir}/ocaml/*.cmxa
 %{_libdir}/ocaml/*.cmx
 %{_libdir}/ocaml/*.o
-%{_libdir}/ocaml/libasmrun_shared.so
 %endif
 %{_libdir}/ocaml/*.mli
 %{_libdir}/ocaml/sys.ml.in
-%{_libdir}/ocaml/libcamlrun_shared.so
 
 %{_libdir}/ocaml/{dynlink,runtime_events,str,threads,unix}/*.mli
 %if %{native_compiler}
@@ -398,12 +384,18 @@ hardlink -t $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 %doc README.html Changes
 %license LICENSE
 %{_bindir}/ocamlrun
+%{_bindir}/*ocamlrun-a100
 %{_bindir}/ocamlrund
+%{_bindir}/*ocamlrund-a100
 %{_bindir}/ocamlruni
+%{_bindir}/*ocamlruni-a100
 %dir %{_libdir}/ocaml
+%{_libdir}/ocaml/libasmrun*.so
+%{_libdir}/ocaml/libcamlrun*.so
 %{_libdir}/ocaml/*.cmo
 %{_libdir}/ocaml/*.cmi
 %{_libdir}/ocaml/*.cma
+%{_libdir}/ocaml/ld.conf
 %{_libdir}/ocaml/stublibs
 %dir %{_libdir}/ocaml/dynlink
 %{_libdir}/ocaml/dynlink/META
@@ -463,6 +455,35 @@ hardlink -t $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 
 
 %changelog
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Tue Jun 23 2026 Jerry James <loganjerry@gmail.com> - 5.5.0-1
+- New upstream version 5.5.0 (RHBZ#2442622)
+- Drop upstreamed fix for arm64 frame pointers
+- Reenable LTO
+- Move ld.conf, libasmrun, and libcamlrun to ocaml-runtime
+- Drop hardlink dependency; rpm now does this by default
+- Drop unused utilx-linux dependency
+
+* Thu Feb 26 2026 Richard W.M. Jones <rjones@redhat.com> - 5.4.1-4
+- Backport fix for arm64 frame pointers
+
+* Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 5.4.1-1
+- New upstream version 5.4.1 (RHBZ#2440356)
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 5.4.0-1
+- New upstream version 5.4.0 (RHBZ#2368289)
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jun 22 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 5.3.0-3
+- Fix RPM macros for Python 3.14
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

ocaml_files.py

@@ -429,7 +429,7 @@ if __name__ == "__main__":
     parser.add_argument('-i', '--install',
                         action='store_true',
                         default=False,
-                        help='install files instead of generating %files')
+                        help='install files instead of generating %%files')
     parser.add_argument('-n', '--no-devel',
                         action='store_true',
                         default=False,

sources

@@ -1 +1 @@
-SHA512 (ocaml-5.3.0.tar.gz) = 73817ada340bdf4091b3edd7b292bd0074c87b4836f202f48ecf0f620a00feaa70ebc9101b97155e8caa6907646dfdf21eff728fa0e14542df3b5e5436229d06
+SHA512 (ocaml-5.5.0.tar.gz) = bf13c18cd1fc7b2e5e9623024ea8623710f646ff2fbc0f59dab70e4d4318ed8623bdcc3ec59ce37af07af2b767f520dea23fb474c26297b3e858b6c8e080b4e6