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/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/ocaml-cppo.spec b/ocaml-cppo.spec index bac471c..03decee 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,23 +1,22 @@ -%undefine _package_note_flags -%ifnarch %{ocaml_native_compiler} -%global debug_package %{nil} -%endif +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} -%define libname cppo +%global giturl https://github.com/ocaml-community/cppo Name: ocaml-cppo -Version: 1.6.8 -Release: 7%{?dist} +Version: 1.8.0 +Release: 5%{?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 +VCS: git:%{giturl}.git +Source0: %{giturl}/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 +47,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 +74,57 @@ dune runtest --profile release %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 + +* 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 + +* 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 +- 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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..d65b626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppo-1.6.8.tar.gz) = 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858 +SHA512 (cppo-1.8.0.tar.gz) = 3840725b767a0300bdc48f11d26d798bdcae0a764ed6798df3a08dfc8cc76fe124b14a19d47c9b5ea8e229d68b0311510afce77c0e4d9131fbda5116dc2689a2 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