From 4164816e135edf89919ec3f3bfb9bb963c23cf13 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 03:23:20 +0000 Subject: [PATCH 01/34] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ocaml-cppo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 32f730d..ac24b3e 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -12,6 +12,7 @@ License: BSD URL: http://mjambon.com/cppo.html Source0: https://github.com/ocaml-community/cppo/archive/v%{version}.tar.gz +BuildRequires: make BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib %if !%{opt} From 9ff33bb9de7344d332941d16815f4a4766db0263 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:55:21 +0000 Subject: [PATCH 02/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index ac24b3e..1aa2baf 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ Name: ocaml-cppo Version: 1.6.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -69,6 +69,9 @@ make test %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.6.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 01 2020 Richard W.M. Jones - 1.6.6-10 - OCaml 4.11.1 rebuild From 07f2fc5509c1d29b5a4edcb95bec42c2b31d2b07 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 11:02:43 +0000 Subject: [PATCH 03/34] OCaml 4.12.0 build --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 1aa2baf..6042072 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ Name: ocaml-cppo Version: 1.6.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -69,6 +69,9 @@ make test %changelog +* Mon Mar 1 11:02:42 GMT 2021 Richard W.M. Jones - 1.6.6-12 +- OCaml 4.12.0 build + * Tue Jan 26 2021 Fedora Release Engineering - 1.6.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bd8e0499500034048c2d18d8d2b5a2dc3d2969c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:35:18 +0000 Subject: [PATCH 04/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 6042072..ad3d662 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ Name: ocaml-cppo Version: 1.6.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -69,6 +69,9 @@ make test %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.6.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 1 11:02:42 GMT 2021 Richard W.M. Jones - 1.6.6-12 - OCaml 4.12.0 build From ca973a41ccc870ac86280e515ee0f3b71696c73a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 22:11:11 +0100 Subject: [PATCH 05/34] OCaml 4.13.1 build --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index ad3d662..bb74657 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ Name: ocaml-cppo Version: 1.6.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -69,6 +69,9 @@ make test %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 1.6.6-14 +- OCaml 4.13.1 build + * Thu Jul 22 2021 Fedora Release Engineering - 1.6.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8952f7cdaefa09278056a3770057fdc493d5e9f8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 15 Dec 2021 10:49:29 -0700 Subject: [PATCH 06/34] Version 1.6.8 - New URLs - Add ocamlbuild subpackage for the plugin - Build, install, and test with dune --- .gitignore | 1 + ocaml-cppo.spec | 71 ++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index cd66ac9..f9d81e9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /v1.6.4.tar.gz /v1.6.5.tar.gz /v1.6.6.tar.gz +/cppo-1.6.8.tar.gz diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index bb74657..58fbd10 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,27 +1,22 @@ -%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%if !%{opt} +%ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif +%define libname cppo + Name: ocaml-cppo -Version: 1.6.6 -Release: 14%{?dist} +Version: 1.6.8 +Release: 1%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD -URL: http://mjambon.com/cppo.html -Source0: https://github.com/ocaml-community/cppo/archive/v%{version}.tar.gz +URL: https://ocaml-community.github.io/cppo/ +Source0: https://github.com/ocaml-community/cppo/archive/v%{version}/%{libname}-%{version}.tar.gz -BuildRequires: make -BuildRequires: ocaml >= 3.10.0 -BuildRequires: ocaml-findlib -%if !%{opt} -Requires: ocaml >= 3.10.0 -%endif -BuildRequires: ocaml-ocamlbuild-devel +BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune - -%define libname %(sed -e 's/^ocaml-//' <<< %{name}) +BuildRequires: ocaml-findlib +BuildRequires: ocaml-ocamlbuild-devel %description Cppo is an equivalent of the C preprocessor targeted at the OCaml @@ -38,37 +33,59 @@ on the standard parsing tools Ocamllex and Ocamlyacc, which contribute to the robustness of cppo across OCaml versions. +%package ocamlbuild +Summary: Preprocessing plugin for ocamlbuild +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-ocamlbuild%{?_isa} +# There is no devel subpackage because this package IS for development purposes + + +%description ocamlbuild +This package contains a plugin for ocamlbuild that enables calling cppo +at build time. To use it, call ocamlbuild with the argument +`-plugin-tag package(cppo_ocamlbuild)`. + + %prep -%setup -q -n %{libname}-%{version} -sed -i.add-debuginfo \ - 's/ocamlopt/ocamlopt -g/;s/ocamlc \(-[co]\)/ocamlc -g \1/' \ - Makefile +%autosetup -n %{libname}-%{version} %build -make %{?_smp_mflags} all +dune build %{?_smp_mflags} --verbose --profile release %install -%{__install} -d $RPM_BUILD_ROOT%{_bindir} -%{__install} -p _build/install/default/bin/cppo $RPM_BUILD_ROOT%{_bindir}/ +dune install --destdir=%{buildroot} + +# We do not want the ml files +find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete + +# We install the documentation with the doc macro +rm -fr %{buildroot}%{_prefix}/doc %check -%ifnarch %{arm} %{power64} -# Fails on armv7hl and ppc64le with: -# Error: math error -make test -%endif +dune runtest --profile release %files %license LICENSE.md %doc Changes README.md %{_bindir}/cppo +%{_libdir}/ocaml/cppo + + +%files ocamlbuild +%{_libdir}/ocaml/cppo_ocamlbuild/ %changelog +* Tue Dec 14 2021 Jerry James - 1.6.8-1 +- Version 1.6.8 +- New URLs +- Add ocamlbuild subpackage for the plugin +- Build, install, and test with dune + * Mon Oct 04 2021 Richard W.M. Jones - 1.6.6-14 - OCaml 4.13.1 build diff --git a/sources b/sources index efd6b16..6e98a3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.6.6.tar.gz) = 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da +SHA512 (cppo-1.6.8.tar.gz) = 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858 From 23bb844396c94e2dcf51a307a5ddadb461bdb771 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:41:36 +0000 Subject: [PATCH 07/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 58fbd10..a18385f 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -6,7 +6,7 @@ Name: ocaml-cppo Version: 1.6.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -80,6 +80,9 @@ dune runtest --profile release %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Jerry James - 1.6.8-1 - Version 1.6.8 - New URLs From f5ed7a03584e3f6d72f2f480511d3529337922d5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 14:22:03 +0000 Subject: [PATCH 08/34] OCaml 4.13.1 rebuild to remove package notes --- ocaml-cppo.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index a18385f..2b40e08 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,3 +1,4 @@ +%undefine _package_note_flags %ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif @@ -6,7 +7,7 @@ Name: ocaml-cppo Version: 1.6.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -80,6 +81,9 @@ dune runtest --profile release %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 1.6.8-3 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Fedora Release Engineering - 1.6.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bed9c73afd890c8c5398e5c3a081b5f64ff599ab Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:40:51 +0100 Subject: [PATCH 09/34] OCaml 4.14.0 rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 2b40e08..eab50a7 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -7,7 +7,7 @@ Name: ocaml-cppo Version: 1.6.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -81,6 +81,9 @@ dune runtest --profile release %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 1.6.8-4 +- OCaml 4.14.0 rebuild + * Fri Feb 04 2022 Richard W.M. Jones - 1.6.8-3 - OCaml 4.13.1 rebuild to remove package notes From aafa5de0c97718b587b9f8e8ed20800a2d343f0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:10:31 +0000 Subject: [PATCH 10/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index eab50a7..7445595 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -7,7 +7,7 @@ Name: ocaml-cppo Version: 1.6.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -81,6 +81,9 @@ dune runtest --profile release %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.6.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jun 18 2022 Richard W.M. Jones - 1.6.8-4 - OCaml 4.14.0 rebuild From f0ee8f97c3f2d1aa880b8cb69fbe0844f2685f76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:05:34 +0000 Subject: [PATCH 11/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 7445595..00ed7a0 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -7,7 +7,7 @@ Name: ocaml-cppo Version: 1.6.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -81,6 +81,9 @@ dune runtest --profile release %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.6.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.6.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e7ec2966a5b4579bd054dfe590ff63604c1461e3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 10:15:33 +0000 Subject: [PATCH 12/34] Rebuild OCaml packages for F38 --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 00ed7a0..bac471c 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -7,7 +7,7 @@ Name: ocaml-cppo Version: 1.6.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD @@ -81,6 +81,9 @@ dune runtest --profile release %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 1.6.8-7 +- Rebuild OCaml packages for F38 + * Thu Jan 19 2023 Fedora Release Engineering - 1.6.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6aa55cb487666c0af45c970e038f6eadb67824a3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 14:45:23 -0600 Subject: [PATCH 13/34] Version 1.6.9 Other changes: - Convert License tag to SPDX - Use new dune macros --- ocaml-cppo.spec | 38 +++++++++++++++----------------------- sources | 2 +- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index bac471c..c051646 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,23 +1,16 @@ -%undefine _package_note_flags -%ifnarch %{ocaml_native_compiler} -%global debug_package %{nil} -%endif - -%define libname cppo - Name: ocaml-cppo -Version: 1.6.8 -Release: 7%{?dist} +Version: 1.6.9 +Release: 1%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs -License: BSD +License: BSD-3-Clause URL: https://ocaml-community.github.io/cppo/ -Source0: https://github.com/ocaml-community/cppo/archive/v%{version}/%{libname}-%{version}.tar.gz +Source0: https://github.com/ocaml-community/cppo/archive/v%{version}/cppo-%{version}.tar.gz BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune BuildRequires: ocaml-findlib -BuildRequires: ocaml-ocamlbuild-devel +BuildRequires: ocaml-ocamlbuild %description Cppo is an equivalent of the C preprocessor targeted at the OCaml @@ -48,30 +41,24 @@ at build time. To use it, call ocamlbuild with the argument %prep -%autosetup -n %{libname}-%{version} +%autosetup -n cppo-%{version} %build -dune build %{?_smp_mflags} --verbose --profile release +%dune_build %install -dune install --destdir=%{buildroot} - -# We do not want the ml files -find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete - -# We install the documentation with the doc macro -rm -fr %{buildroot}%{_prefix}/doc +%dune_install %check -dune runtest --profile release +%dune_check %files %license LICENSE.md -%doc Changes README.md +%doc Changes.md README.md %{_bindir}/cppo %{_libdir}/ocaml/cppo @@ -81,6 +68,11 @@ dune runtest --profile release %changelog +* Mon Jul 10 2023 Jerry James - 1.6.9-1 +- Version 1.6.9 +- Convert License tag to SPDX +- Use new dune macros + * Tue Jan 24 2023 Richard W.M. Jones - 1.6.8-7 - Rebuild OCaml packages for F38 diff --git a/sources b/sources index 6e98a3e..6a84546 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppo-1.6.8.tar.gz) = 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858 +SHA512 (cppo-1.6.9.tar.gz) = 26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44 From f6e3d6553f2e0fa6d817e6f8e595a198214294c1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:23 +0100 Subject: [PATCH 14/34] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- ocaml-cppo.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index c051646..90c2c3c 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,3 +1,6 @@ +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + Name: ocaml-cppo Version: 1.6.9 Release: 1%{?dist} From 308eb61d478d9e419910faf9175cd3ffc45812fc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 23:04:47 +0100 Subject: [PATCH 15/34] OCaml 5.0 rebuild for Fedora 39 --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 90c2c3c..6e6b843 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 1.6.9-2 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 1.6.9-1 - Version 1.6.9 - Convert License tag to SPDX From 8d10201ede35b4998e28cf8211defd08f52b038d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:14:40 +0000 Subject: [PATCH 16/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 6e6b843..18437dc 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.6.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 1.6.9-2 - OCaml 5.0 rebuild for Fedora 39 From c7794e5f0c8fcbaac99eaf9360ae1c28e37f7dfd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 14:02:42 +0100 Subject: [PATCH 17/34] OCaml 5.1 rebuild for Fedora 40 --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 18437dc..e28c859 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 1.6.9-4 +- OCaml 5.1 rebuild for Fedora 40 + * Thu Jul 20 2023 Fedora Release Engineering - 1.6.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 85bfcf9763c569ade83503cea36524dcc5dc8c98 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 09:27:16 +0000 Subject: [PATCH 18/34] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index e28c859..6af1429 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 1.6.9-5 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 1.6.9-4 - OCaml 5.1 rebuild for Fedora 40 From de72b1435fc39c47ccf291ad32495040cfa69921 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 13:42:29 +0000 Subject: [PATCH 19/34] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 6af1429..c93d9be 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 1.6.9-6 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 1.6.9-5 - OCaml 5.1.1 rebuild for Fedora 40 From 91eb42c5f0c66c89f32d6583cb6faaa008f1af9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:13:35 +0000 Subject: [PATCH 20/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index c93d9be..0ce80d0 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.6.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 1.6.9-6 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From a4898bb1fd13ef846960f04a4c92655e33182bc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:54:40 +0000 Subject: [PATCH 21/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 0ce80d0..1399274 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -71,6 +71,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.6.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.6.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3c2ee7058b10a35be143c47a5dfd82a320cb40e8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 May 2024 09:35:16 -0600 Subject: [PATCH 22/34] Add VCS field --- ocaml-cppo.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 1399274..eb9a878 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -8,7 +8,8 @@ Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause URL: https://ocaml-community.github.io/cppo/ -Source0: https://github.com/ocaml-community/cppo/archive/v%{version}/cppo-%{version}.tar.gz +VCS: https://github.com/ocaml-community/cppo +Source0: %{vcs}/archive/v%{version}/cppo-%{version}.tar.gz BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune From 5cf63a1d3c18ba1c6b6e418b7297127c7f49ab86 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 18:11:21 +0100 Subject: [PATCH 23/34] OCaml 5.2.0 for Fedora 41 --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index eb9a878..deac2fd 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -72,6 +72,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Wed May 29 2024 Richard W.M. Jones - 1.6.9-9 +- OCaml 5.2.0 for Fedora 41 + * Thu Jan 25 2024 Fedora Release Engineering - 1.6.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d99999b529643c11e766273ae5e89c2af1bb25cc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 09:14:59 +0100 Subject: [PATCH 24/34] Add RHEL gating test --- gating.yaml | 6 ++++++ tests/basic-test.sh | 6 ++++++ tests/tests.yml | 12 ++++++++++++ 3 files changed, 24 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..2c7ed80 --- /dev/null +++ b/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} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..dd895c1 --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,6 @@ +#!/bin/bash - +set -e +set -x + +# XXX How to test? +# At the moment this is just an installation test. diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..5cc05e9 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - ocaml + - ocaml-cppo + tests: + - simple: + dir: . + run: ./basic-test.sh From 7f6d5217159a7b9c1ecffce1736002049bb7a4c8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 13:41:07 +0100 Subject: [PATCH 25/34] OCaml 5.2.0 ppc64le fix --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index deac2fd..175d734 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -72,6 +72,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 1.6.9-10 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 1.6.9-9 - OCaml 5.2.0 for Fedora 41 From 06d9581d0e2ac1f4bc45bf5f8799ce7ca2c71fa9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 13:51:59 -0600 Subject: [PATCH 26/34] Fix the VCS field --- ocaml-cppo.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 175d734..1e91b3f 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,6 +1,8 @@ # OCaml packages not built on i686 since OCaml 5 / Fedora 39. ExcludeArch: %{ix86} +%global giturl https://github.com/ocaml-community/cppo + Name: ocaml-cppo Version: 1.6.9 Release: 10%{?dist} @@ -8,8 +10,8 @@ Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause URL: https://ocaml-community.github.io/cppo/ -VCS: https://github.com/ocaml-community/cppo -Source0: %{vcs}/archive/v%{version}/cppo-%{version}.tar.gz +VCS: git:%{giturl}.git +Source0: %{giturl}/archive/v%{version}/cppo-%{version}.tar.gz BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune From dcb13125a9cc6240196c8cf1a70d5379065af006 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:04:00 +0000 Subject: [PATCH 27/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 1e91b3f..4c1bfe2 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.6.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -74,6 +74,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.6.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 1.6.9-10 - OCaml 5.2.0 ppc64le fix From 052784cfa570b44d030a37c1f956df72ef0930ba Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Dec 2024 20:15:16 -0700 Subject: [PATCH 28/34] Version 1.8.0 --- .gitignore | 1 + ocaml-cppo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9d81e9..93512e2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /v1.6.5.tar.gz /v1.6.6.tar.gz /cppo-1.6.8.tar.gz +/cppo-1.8.0.tar.gz diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 4c1bfe2..2d85522 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -4,8 +4,8 @@ ExcludeArch: %{ix86} %global giturl https://github.com/ocaml-community/cppo Name: ocaml-cppo -Version: 1.6.9 -Release: 11%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -74,6 +74,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Thu Dec 26 2024 Jerry James - 1.8.0-1 +- Version 1.8.0 + * Thu Jul 18 2024 Fedora Release Engineering - 1.6.9-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 6a84546..d65b626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppo-1.6.9.tar.gz) = 26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44 +SHA512 (cppo-1.8.0.tar.gz) = 3840725b767a0300bdc48f11d26d798bdcae0a764ed6798df3a08dfc8cc76fe124b14a19d47c9b5ea8e229d68b0311510afce77c0e4d9131fbda5116dc2689a2 From dfa67c4858db853a7256ee92b8426a2a3c51a4b5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 10:40:23 -0700 Subject: [PATCH 29/34] OCaml 5.3.0 rebuild for Fedora 42 --- ocaml-cppo.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 2d85522..f49bc36 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -74,7 +74,8 @@ at build time. To use it, call ocamlbuild with the argument %changelog -* Thu Dec 26 2024 Jerry James - 1.8.0-1 +* Thu Jan 9 2025 Jerry James - 1.8.0-1 +- OCaml 5.3.0 rebuild for Fedora 42 - Version 1.8.0 * Thu Jul 18 2024 Fedora Release Engineering - 1.6.9-11 From 8456c22d01c7534b3c3b151071d8d218a8b5b887 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:46:07 +0000 Subject: [PATCH 30/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index f49bc36..18657a1 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -74,6 +74,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 1.8.0-1 - OCaml 5.3.0 rebuild for Fedora 42 - Version 1.8.0 From b6a3a6433a43f81ce3c17dc68166a6773a9e9cdc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 11:35:54 -0600 Subject: [PATCH 31/34] Rebuild to fix OCaml dependencies --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 18657a1..3c5bf20 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -74,6 +74,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Fri Jul 11 2025 Jerry James - 1.8.0-3 +- Rebuild to fix OCaml dependencies + * Fri Jan 17 2025 Fedora Release Engineering - 1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b1f6529a8494e5af24610b307ae45602c38e832f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:09:16 +0000 Subject: [PATCH 32/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 3c5bf20..913a59b 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -74,6 +74,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 1.8.0-3 - Rebuild to fix OCaml dependencies From 728a83caef8ba33f131cbde75cb0257a02cbb07e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 18:38:51 +0100 Subject: [PATCH 33/34] OCaml 5.4.0 rebuild --- ocaml-cppo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 913a59b..28f6c58 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -5,7 +5,7 @@ ExcludeArch: %{ix86} Name: ocaml-cppo Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs License: BSD-3-Clause @@ -74,6 +74,9 @@ at build time. To use it, call ocamlbuild with the argument %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 1.8.0-5 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 1.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c909731789252829cd2aa02c9dddaaf212a0743a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 16:11:11 -0700 Subject: [PATCH 34/34] Fix a changelog entry --- ocaml-cppo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 28f6c58..03decee 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -80,7 +80,7 @@ at build time. To use it, call ocamlbuild with the argument * Thu Jul 24 2025 Fedora Release Engineering - 1.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 1.8.0-3 +* Fri Jul 11 2025 Jerry James - 1.8.0-3 - Rebuild to fix OCaml dependencies * Fri Jan 17 2025 Fedora Release Engineering - 1.8.0-2