Build requires perl

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

.gitignore

@@ -6,3 +6,7 @@
 /rel703.tar.gz
 /rel705.tar.gz
 /camlp5-7.07-git9b9eb124c.tar.gz
+/rel710.tar.gz
+/rel711.tar.gz
+/rel712.tar.gz
+/rel8.00.tar.gz

2865ecfe5e02f8895c555396993b49b3b08a3550.patch

@@ -0,0 +1,36 @@
+From 2865ecfe5e02f8895c555396993b49b3b08a3550 Mon Sep 17 00:00:00 2001
+From: Chet Murthy <chetsky@gmail.com>
+Date: Fri, 15 Jan 2021 12:35:50 -0800
+Subject: [PATCH] fix META file generation (DESTDIR) issue; Fix #75
+
+---
+ Makefile     | 2 +-
+ etc/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c9adcc46..7748ddd6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,7 +51,7 @@ depend:
+ 
+ local-install::
+ 	$(RM) -rf local-install && mkdir -p local-install/lib/ocaml
+-	$(MAKE) DESTDIR=`pwd`/local-install/ LIBDIR=lib BINDIR=bin MANDIR=man install
++	$(MAKE) DESTDIR= LIBDIR=`pwd`/local-install/lib BINDIR=`pwd`/local-install/bin MANDIR=man install
+ 
+ install:
+ 	$(NOVERBOSE) if test -z "$(LIBDIR)"; then \
+diff --git a/etc/Makefile b/etc/Makefile
+index ef4593cc..f8913866 100644
+--- a/etc/Makefile
++++ b/etc/Makefile
+@@ -106,7 +106,7 @@ install:
+ 	-$(MKDIR) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)" "$(DESTDIR)$(BINDIR)"
+ 	$(RM) -f "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/pa_lex.cmo"
+ 	cp $(OBJS) $(INSTALL_CMI) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
+-	sed -e "s|@VERSION@|$(VERSION)|" -e "s|@CAMLP5DIR@|$(DESTDIR)$(LIBDIR)/$(CAMLP5N)|" META.tpl > META
++	sed -e "s|@VERSION@|$(VERSION)|" -e "s|@CAMLP5DIR@|$(LIBDIR)/$(CAMLP5N)|" META.tpl > META
+ 	cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
+ 	cp lib.sml "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
+ 	cp $(CAMLP5N)o$(EXE) $(CAMLP5N)sch$(EXE) "$(DESTDIR)$(BINDIR)/."

camlp5-6.11-kill-warn-error.patch

@@ -1,15 +0,0 @@
---- camlp5-6.11/configure.old	2014-08-24 09:49:01.887731189 +0100
-+++ camlp5-6.11/configure	2014-08-24 09:50:19.043742759 +0100
-@@ -246,11 +246,7 @@
-   OCAMLC_W_Y=""
- fi
- 
--if [ "$($ocamlc -warn-error A 2>&1)" = "" ]; then
--  WARNERR="-warn-error A"
--else
--  WARNERR=""
--fi
-+WARNERR=""
- 
- if make -f config/Makefile.check --no-print-directory >/dev/null 2>&1; then
-   NO_PR_DIR=--no-print-directory

camlp5-8.00-kill-warn-error.patch

@@ -0,0 +1,15 @@
+--- camlp5-rel8.00.old/configure	2020-12-27 22:26:24.000000000 +0000
++++ camlp5-rel8.00/configure	2021-02-28 22:38:08.341646880 +0000
+@@ -243,11 +243,7 @@
+   OCAMLC_W_Y=""
+ fi
+ 
+-if [ "$($ocamlc -warn-error +A-11 2>&1)" = "" ]; then
+-  WARNERR="-warn-error +A-11"
+-else
+-  WARNERR=""
+-fi
++WARNERR=""
+ 
+ if make -f config/Makefile.check --no-print-directory >/dev/null 2>&1; then
+   NO_PR_DIR=--no-print-directory

ocaml-camlp5.spec

@@ -3,24 +3,30 @@
 %global debug_package %{nil}
 %endif
 
+%global major 8
+%global minor 00
+
 Name:           ocaml-camlp5
-Version:        7.08
-Release:        0.5.git9b9eb124c%{?dist}
+Version:        %{major}.%{minor}
+Release:        1%{?dist}
 Summary:        Classical version of camlp4 OCaml preprocessor
 
 License:        BSD
 URL:            https://camlp5.github.io/
 
-#Source0:        https://github.com/camlp5/camlp5/archive/rel700.tar.gz
-# Constructed using:
-# git archive --format=tar --prefix=camlp5-7.07/ HEAD | gzip > /var/tmp/camlp5-7.07-git9b9eb124c.tar.gz
-Source0:        camlp5-7.07-git9b9eb124c.tar.gz
+Source0:        https://github.com/camlp5/camlp5/archive/rel%{major}.%{minor}.tar.gz
 
 # Kill -warn-error A
-Patch0:         camlp5-6.11-kill-warn-error.patch
+Patch0:         camlp5-8.00-kill-warn-error.patch
 
+# https://github.com/camlp5/camlp5/issues/75
+# Upstream in > 8.00.
+Patch1:         2865ecfe5e02f8895c555396993b49b3b08a3550.patch
+
+BuildRequires:  make
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
+BuildRequires:  perl
 
 %global __ocaml_requires_opts -i Asttypes -i Parsetree -i Pa_extend
 %global __ocaml_provides_opts -i Dynlink -i Dynlinkaux -i Pa_extend
@@ -46,8 +52,8 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n camlp5-7.07
-%patch0 -p1
+%setup -q -n camlp5-rel%{major}.%{minor}
+%autopatch -p1
 find . -name .gitignore -delete
 
 # Build with debug information
@@ -59,38 +65,37 @@ done
 
 
 %build
-./configure
+# Upstream uses hand-written configure, grrrrrr.
+./configure \
+    --prefix %{_prefix} \
+    --bindir %{_bindir} \
+    --libdir %{_libdir}/ocaml \
+    --mandir %{_mandir}
 %if %opt
-# For ppc64 we need a larger stack than default to compile some files
-# because the stages in the OCaml compiler are not mutually tail
-# recursive.
-%ifarch ppc64 ppc64le
-ulimit -a
-ulimit -Hs 65536
-ulimit -Ss 65536
-%endif
 make %{_smp_mflags} world.opt
 %else
 make %{_smp_mflags} world
 %endif
-make -C doc/htmlp -j1
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
+# This is a hack because the make install rule is broken upstream.
+# We move the file later.
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/ocaml
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}
-make install \
-  LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \
-  OLIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \
-  BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-  MANDIR=$RPM_BUILD_ROOT%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 cp -p etc/META $RPM_BUILD_ROOT%{_libdir}/ocaml/camlp5
 rm -f doc/htmlp/{*.sh,Makefile,html2*}
+pushd $RPM_BUILD_ROOT%{_libdir}/ocaml
+mv ocaml/topfind.camlp5 .
+rmdir ocaml
+popd
 
 
 %files
 %license LICENSE
-%doc README
+%doc README.md
 %{_libdir}/ocaml/camlp5
 %if %opt
 %exclude %{_libdir}/ocaml/camlp5/*.a
@@ -98,6 +103,7 @@ rm -f doc/htmlp/{*.sh,Makefile,html2*}
 %exclude %{_libdir}/ocaml/camlp5/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/camlp5/*.mli
+%{_libdir}/ocaml/topfind.camlp5
 
 
 %files devel
@@ -115,6 +121,64 @@ rm -f doc/htmlp/{*.sh,Makefile,html2*}
 
 
 %changelog
+* Sun Feb 28 22:24:15 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 8.00-1
+- New upstream version 8.00.
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.12-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Sep 02 2020 Richard W.M. Jones <rjones@redhat.com> - 7.12-9
+- Rebuild with correct tag.
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 7.12-8
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 7.12-1
+- New upstream version 7.12.
+- Remove upstream patches.
+- OCaml 4.11.0 rebuild
+- Remove topfind.camlp5 - seems to have been removed from upstream.
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 7.11-5
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 7.11-4
+- Include all upstream pre-7.12 patches.
+- Fixes support for OCaml 4.11.
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 7.11-3
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 7.11-2
+- Update all OCaml dependencies for RPM 4.16.
+
+* Sun Mar 08 2020 Richard W.M. Jones <rjones@redhat.com> - 7.11-1
+- Update to 7.11.
+- Remove OCaml 4.10 support patch, now included upstream.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 7.10-6
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 7.10-4
+- Add patch for OCaml 4.10 support.
+
+* Sat Jan 18 2020 Richard W.M. Jones <rjones@redhat.com> - 7.10-3
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 7.10-2
+- OCaml 4.09.0 for riscv64
+
+* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 7.10-1
+- Update to release 7.10.
+- OCaml 4.09.0 (final) rebuild.
+
 * Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 7.08-0.5.git9b9eb124c
 - OCaml 4.08.1 (final) rebuild.
 

sources

@@ -1 +1 @@
-SHA512 (camlp5-7.07-git9b9eb124c.tar.gz) = 227c9a58f9b70e8b6ada6eb67b151da4feb2b90d06d040d40bb28f492b16b9800a3cfc513b52c8f6d518b003d653091a1e87b93ea5f3c6a865358c9fbb82d522
+SHA512 (rel8.00.tar.gz) = 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93