OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,7 @@
 /cppo-1.0.1.tar.gz
+/cppo-1.1.2.tar.gz
+/v1.4.0.tar.gz
+/v1.5.0.tar.gz
+/v1.6.4.tar.gz
+/v1.6.5.tar.gz
+/v1.6.6.tar.gz

ocaml-cppo.spec

@@ -4,19 +4,22 @@
 %endif
 
 Name:           ocaml-cppo
-Version:        1.0.1
-Release:        1%{?dist}
+Version:        1.6.6
+Release:        12%{?dist}
 Summary:        Equivalent of the C preprocessor for OCaml programs
 
 License:        BSD
 URL:            http://mjambon.com/cppo.html
-Source0:        http://mjambon.com/releases/cppo/cppo-%{version}.tar.gz
+Source0:        https://github.com/ocaml-community/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
 
 %define libname %(sed -e 's/^ocaml-//' <<< %{name})
 
@@ -43,28 +46,149 @@ sed -i.add-debuginfo \
 
 
 %build
-%if %opt
-make %{?_smp_mflags} opt
-%else
 make %{?_smp_mflags} all
-%endif
 
 
 %install
 %{__install} -d $RPM_BUILD_ROOT%{_bindir}
-%{__install} -p cppo $RPM_BUILD_ROOT%{_bindir}/
+%{__install} -p _build/install/default/bin/cppo $RPM_BUILD_ROOT%{_bindir}/
 
 
 %check
+%ifnarch %{arm} %{power64}
+# Fails on armv7hl and ppc64le with:
+# Error: math error
 make test
+%endif
 
 
 %files
-%doc LICENSE README.md Changes
+%license LICENSE.md
+%doc Changes README.md
 %{_bindir}/cppo
 
 
 %changelog
+* 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
+
+* 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
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.6.4-2
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.6.4-1
+- New upstream version 1.6.4.
+
+* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-8
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-6
+- OCaml 4.06.0 rebuild.
+
+* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-5
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-2
+- OCaml 4.04.2 rebuild.
+
+* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-1
+- New upstream version 1.5.0 (for OCaml 4.04.1).
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
+- New upstream version 1.4.0.
+- Fix download source URL.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-2
+- OCaml 4.02.3 rebuild.
+
+* Fri Jul 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-1
+- New upstream release 1.1.2.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-4
+- ocaml-4.02.2 final rebuild.
+
+* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-3
+- ocaml-4.02.2 rebuild.
+
+* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-2
+- ocaml-4.02.1 rebuild.
+
 * Mon Nov  3 2014 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.0.1-1
 - Update to 1.0.1
 

sources

@@ -1 +1 @@
-b258d7a9961c6fe68155b030a2a22413  cppo-1.0.1.tar.gz
+SHA512 (v1.6.6.tar.gz) = 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da