.gitignore

@@ -1 +1 @@
-SOURCES/cppo-1.6.9.tar.gz
+SOURCES/v1.6.6.tar.gz

.ocaml-cppo.metadata

@@ -1 +1 @@
-8b672aa68aff00699e1c92becf230ee71e33d836 SOURCES/cppo-1.6.9.tar.gz
+0ec51fb584ffabc4f41b54494d23b0cfd42a0e02 SOURCES/v1.6.6.tar.gz

SPECS/ocaml-cppo.spec

@@ -1,20 +1,27 @@
-# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-ExcludeArch: %{ix86}
+%if !%{opt}
+%global debug_package %{nil}
+%endif
 
 Name:           ocaml-cppo
-Version:        1.6.9
+Version:        1.6.6
-Release:        12%{?dist}
+Release:        15%{?dist}
 Summary:        Equivalent of the C preprocessor for OCaml programs
 
-License:        BSD-3-Clause
+License:        BSD
-URL:            https://ocaml-community.github.io/cppo/
+URL:            http://mjambon.com/cppo.html
-VCS:            https://github.com/ocaml-community/cppo
+Source0:        https://github.com/ocaml-community/cppo/archive/v%{version}.tar.gz
-Source0:        %{vcs}/archive/v%{version}/cppo-%{version}.tar.gz
 
-BuildRequires:  ocaml >= 4.02.3
+BuildRequires: make
-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
@@ -31,118 +38,51 @@ 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
-* Wed Oct 30 2024 Troy Dawson <tdawson@redhat.com> - 1.6.9-12
+* Fri Mar 11 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-15
-- Bump release for October 2024 mass rebuild:
+- Rebuild for EPEL
-  Resolves: RHEL-64018
+resolves: rhbz#2060850
-
-* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 1.6.9-11
-- Bump release for June 2024 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
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.6-14
-- OCaml 4.13.1 build
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-13
+* Wed Jun 23 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bump and rebuild
+  resolves: rhbz#1975301
 
-* Mon Mar  1 11:02:42 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-12
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.6-12
-- OCaml 4.12.0 build
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild