Compare commits

..

1 commit

Author SHA1 Message Date
Richard W.M. Jones
a099df281b Bump release and rebuild. 2020-09-02 21:18:22 +01:00
6 changed files with 33 additions and 149 deletions

2
.gitignore vendored
View file

@ -5,5 +5,3 @@
/v1.6.4.tar.gz
/v1.6.5.tar.gz
/v1.6.6.tar.gz
/cppo-1.6.8.tar.gz
/cppo-1.8.0.tar.gz

View file

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

View file

@ -1,22 +1,26 @@
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
%global giturl https://github.com/ocaml-community/cppo
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%if !%{opt}
%global debug_package %{nil}
%endif
Name: ocaml-cppo
Version: 1.8.0
Release: 5%{?dist}
Version: 1.6.6
Release: 10%{?dist}.1
Summary: Equivalent of the C preprocessor for OCaml programs
License: BSD-3-Clause
URL: https://ocaml-community.github.io/cppo/
VCS: git:%{giturl}.git
Source0: %{giturl}/archive/v%{version}/cppo-%{version}.tar.gz
License: BSD
URL: http://mjambon.com/cppo.html
Source0: https://github.com/ocaml-community/cppo/archive/v%{version}.tar.gz
BuildRequires: ocaml >= 4.02.3
BuildRequires: ocaml-dune
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib
BuildRequires: ocaml-ocamlbuild
%if !%{opt}
Requires: ocaml >= 3.10.0
%endif
BuildRequires: ocaml-ocamlbuild-devel
BuildRequires: ocaml-dune
%define libname %(sed -e 's/^ocaml-//' <<< %{name})
%description
Cppo is an equivalent of the C preprocessor targeted at the OCaml
@ -33,133 +37,39 @@ 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
%autosetup -n cppo-%{version}
%setup -q -n %{libname}-%{version}
sed -i.add-debuginfo \
's/ocamlopt/ocamlopt -g/;s/ocamlc \(-[co]\)/ocamlc -g \1/' \
Makefile
%build
%dune_build
make %{?_smp_mflags} all
%install
%dune_install
%{__install} -d $RPM_BUILD_ROOT%{_bindir}
%{__install} -p _build/install/default/bin/cppo $RPM_BUILD_ROOT%{_bindir}/
%check
%dune_check
%ifnarch %{arm} %{power64}
# Fails on armv7hl and ppc64le with:
# Error: math error
make test
%endif
%files
%license LICENSE.md
%doc Changes.md README.md
%doc Changes README.md
%{_bindir}/cppo
%{_libdir}/ocaml/cppo
%files ocamlbuild
%{_libdir}/ocaml/cppo_ocamlbuild/
%changelog
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-5
- OCaml 5.4.0 rebuild
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 1.8.0-3
- Rebuild to fix OCaml dependencies
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jan 9 2025 Jerry James <loganjerry@gmail.com> - 1.8.0-1
- OCaml 5.3.0 rebuild for Fedora 42
- Version 1.8.0
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.6.9-10
- OCaml 5.2.0 ppc64le fix
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1.6.9-9
- OCaml 5.2.0 for Fedora 41
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.6.9-6
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.6.9-5
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.6.9-4
- OCaml 5.1 rebuild for Fedora 40
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.6.9-2
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 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 <rjones@redhat.com> - 1.6.8-7
- Rebuild OCaml packages for F38
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6.8-4
- OCaml 4.14.0 rebuild
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6.8-3
- OCaml 4.13.1 rebuild to remove package notes
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Dec 14 2021 Jerry James <loganjerry@gmail.com> - 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 <rjones@redhat.com> - 1.6.6-14
- OCaml 4.13.1 build
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <rjones@redhat.com> - 1.6.6-12
- OCaml 4.12.0 build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Sep 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-10.1
- Bump release and rebuild.
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-10
- OCaml 4.11.1 rebuild

View file

@ -1 +1 @@
SHA512 (cppo-1.8.0.tar.gz) = 3840725b767a0300bdc48f11d26d798bdcae0a764ed6798df3a08dfc8cc76fe124b14a19d47c9b5ea8e229d68b0311510afce77c0e4d9131fbda5116dc2689a2
SHA512 (v1.6.6.tar.gz) = 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da

View file

@ -1,6 +0,0 @@
#!/bin/bash -
set -e
set -x
# XXX How to test?
# At the moment this is just an installation test.

View file

@ -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