diff --git a/.gitignore b/.gitignore index 93512e2..f9d81e9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /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 deleted file mode 100755 index 2c7ed80..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !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 03decee..2b40e08 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -1,22 +1,23 @@ -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} +%undefine _package_note_flags +%ifnarch %{ocaml_native_compiler} +%global debug_package %{nil} +%endif -%global giturl https://github.com/ocaml-community/cppo +%define libname cppo Name: ocaml-cppo -Version: 1.8.0 -Release: 5%{?dist} +Version: 1.6.8 +Release: 3%{?dist} Summary: Equivalent of the C preprocessor for OCaml programs -License: BSD-3-Clause +License: BSD URL: https://ocaml-community.github.io/cppo/ -VCS: git:%{giturl}.git -Source0: %{giturl}/archive/v%{version}/cppo-%{version}.tar.gz +Source0: https://github.com/ocaml-community/cppo/archive/v%{version}/%{libname}-%{version}.tar.gz BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune BuildRequires: ocaml-findlib -BuildRequires: ocaml-ocamlbuild +BuildRequires: ocaml-ocamlbuild-devel %description Cppo is an equivalent of the C preprocessor targeted at the OCaml @@ -47,24 +48,30 @@ at build time. To use it, call ocamlbuild with the argument %prep -%autosetup -n cppo-%{version} +%autosetup -n %{libname}-%{version} %build -%dune_build +dune build %{?_smp_mflags} --verbose --profile release %install -%dune_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 %check -%dune_check +dune runtest --profile release %files %license LICENSE.md -%doc Changes.md README.md +%doc Changes README.md %{_bindir}/cppo %{_libdir}/ocaml/cppo @@ -74,69 +81,6 @@ 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 - -* 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 - -* 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 - -* 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 diff --git a/sources b/sources index d65b626..6e98a3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppo-1.8.0.tar.gz) = 3840725b767a0300bdc48f11d26d798bdcae0a764ed6798df3a08dfc8cc76fe124b14a19d47c9b5ea8e229d68b0311510afce77c0e4d9131fbda5116dc2689a2 +SHA512 (cppo-1.6.8.tar.gz) = 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858 diff --git a/tests/basic-test.sh b/tests/basic-test.sh deleted file mode 100755 index dd895c1..0000000 --- a/tests/basic-test.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 deleted file mode 100755 index 5cc05e9..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - ocaml - - ocaml-cppo - tests: - - simple: - dir: . - run: ./basic-test.sh