Fix a changelog entry

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

If there will be no comments in two weeks, I will merge this.

.gitignore

@@ -1,4 +1,2 @@
-/ocaml-ocamlbuild-0.9.3.tar.gz
-/ocaml-ocamlbuild-0.11.0.tar.gz
-/ocaml-ocamlbuild-0.12.0.tar.gz
-/ocaml-ocamlbuild-0.14.0.tar.gz
+/ocaml-ocamlbuild-*.tar.gz
+/ocamlbuild-*.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

ocaml-ocamlbuild.spec

@@ -1,37 +1,48 @@
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
+
+# NOTE: there is no devel subpackage because the main package *IS* a devel
+# package.
+
 %ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
 Name:          ocaml-ocamlbuild
-Version:       0.14.0
-Release:       13%{?dist}
+Version:       0.16.1
+Release:       3%{?dist}
 
 Summary:       Build tool for OCaml libraries and programs
 
-License:       LGPLv2+ with exceptions
+License:       LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 
 URL:           https://github.com/ocaml/ocamlbuild
-Source0:       https://github.com/ocaml/ocamlbuild/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+VCS:           git:%{url}.git
+Source0:       %{url}/archive/%{version}/ocamlbuild-%{version}.tar.gz
 
-BuildRequires: ocaml >= 4.04.0
+BuildRequires: make
+BuildRequires: ocaml >= 4.08
+BuildRequires: ocaml-rpm-macros
+BuildRequires: ncurses
+BuildRequires: asciidoc
+BuildRequires: python3-pygments
+
+# Ocamlbuild can invoke tput; see src/display.ml
+Requires:      ncurses
+
+# This can be removed when F42 reaches EOL
+Obsoletes:     %{name}-devel < 0.14.0-37
+Provides:      %{name}-devel = %{version}-%{release}
 
 
 %description
 OCamlbuild is a build tool for building OCaml libraries and programs.
 
 
-%package devel
-Summary:       Development files for %{name}
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-
-
-%description devel
-This package contains development files for %{name}.
-
-
 %package doc
 Summary:       Documentation for %{name}
-Requires:      %{name}%{?_isa} = %{version}-%{release}
+License:       CC0-1.0
+BuildArch:     noarch
 
 
 %description doc
@@ -39,7 +50,7 @@ This package contains the manual for %{name}.
 
 
 %prep
-%setup -q -n ocamlbuild-%{version}
+%autosetup -n ocamlbuild-%{version}
 
 
 %build
@@ -47,10 +58,13 @@ make configure \
   OCAMLBUILD_PREFIX=%{_prefix} \
   OCAMLBUILD_BINDIR=%{_bindir} \
   OCAMLBUILD_LIBDIR=%{_libdir}/ocaml \
+  OCAMLBUILD_MANDIR=%{_mandir} \
 %ifarch %{ocaml_native_compiler}
-  OCAML_NATIVE=true
+  OCAML_NATIVE=true \
+  OCAML_NATIVE_TOOLS=true
 %else
-  OCAML_NATIVE=false
+  OCAML_NATIVE=false \
+  OCAML_NATIVE_TOOLS=false
 %endif
 
 # Parallel builds fail.
@@ -63,11 +77,12 @@ make \
      OCAMLOPT="ocamlopt -g"
 %endif
 
+# Build the manual
+asciidoc manual/manual.adoc
+
 
 %install
-make install \
-     DESTDIR=$RPM_BUILD_ROOT \
-     CHECK_IF_PREINSTALLED=false
+%make_install CHECK_IF_PREINSTALLED=false
 
 # The install copies ocamlbuild & ocamlbuild.{byte or native}.
 # Symlink them instead.
@@ -79,51 +94,154 @@ ln -sf ocamlbuild.byte ocamlbuild
 %endif
 popd
 
-# Install the man page, which for some reason is not copied
-# in by the make install rule above.
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
-install -p -m 0644 man/ocamlbuild.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-
-# Remove the META file.  It will be replaced by ocaml-ocamlfind (findlib).
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild/META
+%ocaml_files -n
 
 
-%files
+%files -f .ofiles
 %doc Changes Readme.md VERSION
 %license LICENSE
-%{_bindir}/ocamlbuild
-%{_bindir}/ocamlbuild.byte
-%ifarch %{ocaml_native_compiler}
-%{_bindir}/ocamlbuild.native
-%endif
-%{_mandir}/man1/ocamlbuild.1*
-%{_libdir}/ocaml/ocamlbuild
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/ocamlbuild/*.a
-%exclude %{_libdir}/ocaml/ocamlbuild/*.o
-%exclude %{_libdir}/ocaml/ocamlbuild/*.cmx
-%exclude %{_libdir}/ocaml/ocamlbuild/*.cmxa
-%endif
-%exclude %{_libdir}/ocaml/ocamlbuild/*.mli
-
-
-%files devel
-%license LICENSE
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/ocamlbuild/*.a
-%{_libdir}/ocaml/ocamlbuild/*.o
-%{_libdir}/ocaml/ocamlbuild/*.cmx
-%{_libdir}/ocaml/ocamlbuild/*.cmxa
-%endif
-%{_libdir}/ocaml/ocamlbuild/*.mli
 
 
 %files doc
-%license LICENSE
-%doc manual/*
+%license manual/LICENSE
+%doc manual/manual.html
 
 
 %changelog
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 0.16.1-3
+- OCaml 5.4.0 rebuild
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 0.16.1-1
+- Version 0.16.1
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan  9 2025 Jerry James <loganjerry@gmail.com> - 0.15.0-2
+- OCaml 5.3.0 rebuild for Fedora 42
+- Add VCS field
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jul 04 2024 Richard W.M. Jones <rjones@redhat.com> - 0.15.0-1
+- New upstream version 0.15.0 (RHBZ#1992935)
+
+* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.14.3-5
+- OCaml 5.2.0 ppc64le fix
+
+* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 0.14.3-4
+- OCaml 5.2.0 for Fedora 41
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 02 2024 Richard W.M. Jones <rjones@redhat.com> - 0.14.3-1
+- New upstream version 0.14.3 (RHBZ#1992935)
+
+* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-6
+- OCaml 5.1.1 + s390x code gen fix for Fedora 40
+
+* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-5
+- OCaml 5.1.1 rebuild for Fedora 40
+
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-4
+- OCaml 5.1 rebuild for Fedora 40
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-2
+- OCaml 5.0 rebuild for Fedora 39
+
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 0.14.2-1
+- Version 0.14.2
+- Convert License tag to SPDX
+- Change license for the doc subpackage to CC0
+- Make the doc subpackage noarch
+- Fold the devel subpackage into the main package
+- Ship the manual as HTML instead of asciidoc source
+- Use new OCaml macros
+
+* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-36
+- Rebuild OCaml packages for F38
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-33
+- OCaml 4.14.0 rebuild
+
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-32
+- Bump release and rebuild.
+
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-31
+- OCaml 4.13.1 rebuild to remove package notes
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-29
+- Bump and rebuild for OCaml 4.13.1
+
+* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-28
+- OCaml 4.13.1 build
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 19 2021 Jerry James <loganjerry@gmail.com> - 0.14.0-26
+- Specify OCAMLBUILD_MANDIR to fix man page installation
+
+* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-26
+- Bump and rebuild for ELN broken deps.
+
+* Sun Feb 28 22:16:45 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-25
+- Bump release and rebuild.
+
+* Sun Feb 28 22:08:24 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-24
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 31 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-22
+- Fix license field (RHBZ#1911667).
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-21
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-20
+- OCaml 4.11.0 rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-19
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-17
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-16
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-15
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-14
+- Update all OCaml dependencies for RPM 4.16.
+
 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-13
 - OCaml 4.10.0 final.
 

sources

@@ -1 +1 @@
-SHA512 (ocaml-ocamlbuild-0.14.0.tar.gz) = ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
+SHA512 (ocamlbuild-0.16.1.tar.gz) = e918b9a0081f271e507c7a4f4d5d5a7cdf818ca51c52acec1bac85ddad5f6cad078cb3c568252fbcf5401c2d75323ed8f50fdd881bda1c9632840320408393ae

tests/basic-test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -
+set -e
+set -x
+
+# Just check ocamlbuild runs.
+ocamlbuild --version

tests/tests.yml

@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - ocaml
+    - ocaml-ocamlbuild
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh