3 changed files with 22 additions and 92 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/v1.6.6.tar.gz
+SOURCES/v1.6.4.tar.gz
--- a/.ocaml-cppo.metadata
+++ b/.ocaml-cppo.metadata
@ -1 +1 @@
-0ec51fb584ffabc4f41b54494d23b0cfd42a0e02 SOURCES/v1.6.6.tar.gz
+eaf6bc9d3d141d9a3712b99cc0a4ed494c33d8e8 SOURCES/v1.6.4.tar.gz
--- a/SPECS/ocaml-cppo.spec
+++ b/SPECS/ocaml-cppo.spec
@ -4,22 +4,21 @@
 %endif

 Name:           ocaml-cppo
-Version:        1.6.6
-Release:        15%{?dist}
+Version:        1.6.4
+Release:        4%{?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
+Source0:        https://github.com/mjambon/cppo/archive/v%{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-dune
+#BuildRequires:  jbuilder

 %define libname %(sed -e 's/^ocaml-//' <<< %{name})

@ -40,26 +39,28 @@ to the robustness of cppo across OCaml versions.

 %prep
 %setup -q -n %{libname}-%{version}
-sed -i.add-debuginfo \
-    's/ocamlopt/ocamlopt -g/;s/ocamlc \(-[co]\)/ocamlc -g \1/' \
-    Makefile


 %build
-make %{?_smp_mflags} all
-
+# As we don't have jbuild on RHEL, just build the sources by hand.
+pushd src
+ocamllex cppo_lexer.mll
+ocamlyacc cppo_parser.mly
+echo 'let cppo_version = "v%{version}"' > cppo_version.ml
+ocamlfind opt -g -package str,unix cppo_version.mli cppo_version.ml cppo_types.mli cppo_types.ml cppo_parser.mli cppo_parser.ml cppo_lexer.ml cppo_command.mli cppo_command.ml cppo_eval.mli cppo_eval.ml cppo_main.ml -linkpkg -o cppo
+popd

 %install
 %{__install} -d $RPM_BUILD_ROOT%{_bindir}
-%{__install} -p _build/install/default/bin/cppo $RPM_BUILD_ROOT%{_bindir}/
+%{__install} -p src/cppo $RPM_BUILD_ROOT%{_bindir}/


-%check
-%ifnarch %{arm} %{power64}
-# Fails on armv7hl and ppc64le with:
-# Error: math error
-make test
-%endif
+#%check
+#%ifnarch %{arm} %{power64}
+## Fails on armv7hl and ppc64le with:
+## Error: math error
+#make test
+#%endif


 %files
@ -69,79 +70,8 @@ make test


 %changelog
-* Fri Mar 11 2022 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-15
- Rebuild for EPEL
-resolves: rhbz#2060850
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.6-14
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 23 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-13
- Bump and rebuild
-  resolves: rhbz#1975301
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.6-12
- 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
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-10
- OCaml 4.11.1 rebuild
-
-* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-9
- OCaml 4.11.0 rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-8
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-6
- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-5
- OCaml 4.11.0 pre-release attempt 2
-
-* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-4
- Update all OCaml dependencies for RPM 4.16.
-
-* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-3
- OCaml 4.10.0 final.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.6.6-1
- New upstream version 1.6.6.
- Change build system from jbuilder to dune.
- Remove patch for fix which is now upstream.
- OCaml 4.10.0+beta1 rebuild.
-
-* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.6.5-6
- OCaml 4.09.0 (final) rebuild.
-
-* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.6.5-5
- OCaml 4.08.1 (final) rebuild.
-
-* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.6.5-4
- OCaml 4.08.1 (rc2) rebuild.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.6.5-2
- OCaml 4.08.0 (final) rebuild.
-
-* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.6.5-1
- New upstream version 1.6.5.
- OCaml 4.08.0 (beta 3) rebuild.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon Jul 16 2018 Richard W.M. Jones <rjones@redhat.com> - 1.6.4-4
+- RHEL 8: Remove jbuilder dependency.

 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild