Compare commits

..

87 Commits
f13 ... rawhide

Author SHA1 Message Date
Richard W.M. Jones
dcd76554d3 Build requires perl 2021-03-01 09:24:34 +00:00
Richard W.M. Jones
979f8b676d New upstream version 8.00. 2021-02-28 23:02:28 +00:00
Richard W.M. Jones
5fcfb0274d OCaml 4.12.0 build 2021-02-28 22:24:16 +00:00
Fedora Release Engineering
4dc5e00cfb - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:54:25 +00:00
Tom Stellard
39471845d4 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-07 06:11:02 +00:00
Richard W.M. Jones
97160be640 Rebuild with correct tag. 2020-09-02 09:13:26 +01:00
Richard W.M. Jones
69b7070749 Another hack/workaround for 4.11.1 release. 2020-09-01 20:49:53 +01:00
Richard W.M. Jones
47bb928d91 Add small hack/workaround for 4.11.1 release. 2020-09-01 20:43:06 +01:00
Richard W.M. Jones
51f1474e92 OCaml 4.11.1 rebuild 2020-09-01 19:46:31 +01:00
Richard W.M. Jones
898c2f2366 New upstream version 7.12.
Remove upstream patches.
OCaml 4.11.0 rebuild
Remove topfind.camlp5 - seems to have been removed from upstream.
2020-08-21 11:07:54 +01:00
Richard W.M. Jones
855e720e36 OCaml 4.11.0 rebuild 2020-08-21 10:38:38 +01:00
Fedora Release Engineering
6a17caa8b8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 12:06:45 +00:00
Richard W.M. Jones
512923173e OCaml 4.11.0+dev2-2020-04-22 rebuild 2020-05-04 19:14:07 +01:00
Richard W.M. Jones
9b92758266 Include all upstream pre-7.12 patches.
Fixes support for OCaml 4.11.
2020-05-04 17:36:07 +01:00
Richard W.M. Jones
3a8d4d777e OCaml 4.11.0 pre-release 2020-04-17 20:22:41 +01:00
Richard W.M. Jones
d47187327e Update all OCaml dependencies for RPM 4.16. 2020-04-02 11:52:44 +01:00
Richard W.M. Jones
2632c31284 Update to 7.11.
Remove OCaml 4.10 support patch, now included upstream.
2020-03-08 12:54:43 +00:00
Richard W.M. Jones
613f1f2995 OCaml 4.10.0 final. 2020-02-26 10:21:09 +00:00
Fedora Release Engineering
ab14ef71d5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 19:31:23 +00:00
Richard W.M. Jones
bffad43f1c Add patch for OCaml 4.10 support. 2020-01-19 11:28:36 +00:00
Richard W.M. Jones
3f8125c358 OCaml 4.10.0+beta1 rebuild. 2020-01-18 22:06:34 +00:00
Richard W.M. Jones
2e57e11d58 OCaml 4.09.0 for riscv64 2020-01-09 12:19:24 +00:00
Richard W.M. Jones
8a37e57374 Update to release 7.10. 2019-12-05 21:18:52 +00:00
Richard W.M. Jones
7abaa82fd2 OCaml 4.09.0 (final) rebuild. 2019-12-05 20:18:39 +00:00
Richard W.M. Jones
1e023e8801 OCaml 4.08.1 (final) rebuild. 2019-08-16 15:34:41 +01:00
Richard W.M. Jones
2ba6cd32b7 OCaml 4.08.1 (rc2) rebuild. 2019-07-31 18:03:49 +01:00
Fedora Release Engineering
ba2fd7ea9b - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 22:49:40 +00:00
Richard W.M. Jones
beab619d95 OCaml 4.08.0 (final) rebuild. 2019-06-27 19:58:54 +01:00
Richard W.M. Jones
7c782e268c Update to prerelease of 7.08 which will support OCaml 4.08. 2019-06-27 14:39:40 +01:00
Richard W.M. Jones
02ee537a99 Bump release and rebuild. 2019-04-29 19:00:23 +01:00
Richard W.M. Jones
42759de697 Bump release and rebuild. 2019-04-29 18:50:09 +01:00
Richard W.M. Jones
a6f461f854 OCaml 4.08.0 (beta 3) rebuild. 2019-04-29 16:31:26 +01:00
Fedora Release Engineering
b89a13d383 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 16:47:18 +00:00
Igor Gnatenko
be75454c81 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:23 +01:00
Fedora Release Engineering
f0a4cd31eb - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 14:41:34 +00:00
Richard W.M. Jones
4910c217f6 OCaml 4.07.0 (final) rebuild. 2018-07-11 14:24:14 +01:00
Richard W.M. Jones
10354b3d7b Bump release. 2018-06-19 23:39:35 +01:00
Richard W.M. Jones
0163df3ec4 Add support for 4.07. 2018-06-19 23:36:13 +01:00
Richard W.M. Jones
ba008944e8 New upstream version 7.05.
Bump and rebuild for OCaml 4.07.0-rc1.
2018-06-19 23:12:32 +01:00
Richard W.M. Jones
8ff16b8602 Bump and rebuild for OCaml 4.07.0-rc1. 2018-06-19 23:10:12 +01:00
Richard W.M. Jones
7b6eaf8bdb OCaml 4.07.0-beta2 rebuild. 2018-04-26 19:00:43 +01:00
Fedora Release Engineering
8dc74dba9f - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 08:47:12 +00:00
Richard W.M. Jones
8e1b0761c4 New upstream version 7.03. 2017-11-18 11:33:32 +00:00
Richard W.M. Jones
7de318ebc1 OCaml 4.06.0 rebuild. 2017-11-17 23:47:28 +00:00
Richard W.M. Jones
97f3d0f18d OCaml 4.05.0 rebuild. 2017-08-08 20:36:14 +01:00
Fedora Release Engineering
66afc2f7bf - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:14:06 +00:00
Fedora Release Engineering
0b3fc448d5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 01:26:41 +00:00
Richard W.M. Jones
25a8f09504 New upstream version 7.00. 2017-06-27 13:03:46 +01:00
Richard W.M. Jones
df699c752e OCaml 4.04.2 rebuild. 2017-06-27 12:46:55 +01:00
Richard W.M. Jones
2a44bfd4b1 OCaml 4.04.1 rebuild. 2017-05-13 12:29:11 +01:00
Fedora Release Engineering
1afe5c3bc4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 00:29:55 +00:00
Richard W.M. Jones
ea46ed074f New upstream version 6.17 with support for OCaml 4.04. 2016-12-03 13:22:54 +00:00
Fedora Release Engineering
a803c3e55d - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 11:05:21 +00:00
Richard W.M. Jones
863742b2fc New upstream version 6.14. 2015-07-30 22:36:18 +01:00
Richard W.M. Jones
a440de2a60 OCaml 4.02.3 rebuild. 2015-07-28 15:49:47 +01:00
Richard W.M. Jones
210e09dbbe ocaml-4.02.2 final rebuild. 2015-06-24 17:20:51 +01:00
Richard W.M. Jones
35c615683c New upstream version 6.13.
- ocaml-4.02.2 rebuild.
2015-06-17 15:28:30 +01:00
Richard W.M. Jones
9f780fd83a ocaml-4.02.2 rebuild. 2015-06-17 15:16:21 +01:00
Ville Skyttä
71ee0681d5 Mark LICENSE as %license, don't ship .gitignore 2015-05-15 16:38:56 +03:00
Richard W.M. Jones
c25ad8c7bf ocaml-4.02.1 rebuild. 2015-02-16 20:49:09 +00:00
Jerry James
e01d55e64d Update to 6.12 final.
Also:
- Drop upstreamed patches (all but -kill-warn-error).
- Drop debuginfo workaround; fixed upstream.
2014-11-06 10:12:53 -07:00
Richard W.M. Jones
be1f695071 ocaml-4.02.0 final rebuild. 2014-08-30 18:11:00 +01:00
Richard W.M. Jones
3a83cdb85d Fixes for 4.02.0+rc1.
- Kill -warn-error everywhere hopefully.
- Update parsing/location.mli from OCaml sources.
- Fix release numbering.
2014-08-24 09:58:53 +01:00
Richard W.M. Jones
892df99986 ocaml-4.02.0+rc1 rebuild. 2014-08-23 17:16:25 +01:00
Peter Robinson
8eb89e83ef - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 12:46:33 +00:00
Richard W.M. Jones
d5b9b703e7 ocaml-4.02.0-0.8.git10e45753.fc22 build. 2014-08-01 20:52:33 +01:00
Richard W.M. Jones
c6e3b00a58 Rebase to 6.12 prerelease which supports OCaml 4.02.
- OCaml 4.02.0 beta rebuild.
- New source URL.
2014-08-01 10:29:37 +01:00
Richard W.M. Jones
3bfde46e4f OCaml 4.02.0 beta rebuild. 2014-07-21 11:22:26 +01:00
Dennis Gilmore
035eb4bf5e - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 10:32:46 -05:00
Richard W.M. Jones
1e66b3d1a4 Remove ocaml_arches macro (RHBZ#1087794). 2014-04-15 13:38:22 +01:00
Michel Normand
257252e7b6 increase stack size to compile on ppc64/ppc64le archi
in fact required for ppc64le but do the
same type of change and comment as done in ocaml.spec

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
2014-04-10 04:34:12 -04:00
Jerry James
2fb75ff396 New upstream version 6.11 (provides OCaml 4.01.0 support).
Build with debug information.
Drop upstreamed -typevar patch.
Upstream now provides its own META file.
2013-09-15 21:30:55 -06:00
Dennis Gilmore
cc93a96521 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 09:49:09 -05:00
Dennis Gilmore
4f5c34022a - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 02:55:44 -06:00
Jerry James
ffb7336cb5 Patches work better when they are applied. 2012-10-17 16:54:00 -06:00
Jerry James
77ebc57e80 Add -typevar patch to fix the build. 2012-10-17 16:44:10 -06:00
Jerry James
dfccee1746 New upstream version 6.07 (provides OCaml 4.00.1 support). 2012-10-17 16:23:06 -06:00
Richard W.M. Jones
e0c0b7c375 Fix changelog. 2012-07-28 16:01:28 +01:00
Richard W.M. Jones
83658c433d Rebuild for OCaml 4.00.0 official release. 2012-07-28 16:00:51 +01:00
Dennis Gilmore
6362181282 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-20 00:52:28 -05:00
Richard W.M. Jones
5b63fa885c Rebuild for OCaml 4.00.0. 2012-06-10 22:09:43 +01:00
Jerry James
acfe8e9bc7 New upstream version 6.06 (provides OCaml 4.0 support).
Add HTML documentation to the -devel package.
2012-06-08 15:42:41 -06:00
Richard W.M. Jones
0e6d1b4912 Rebuild for OCaml 3.12.1. 2012-01-06 14:55:17 +00:00
Jerry James
55d9cda45a New upstream version 6.02.3 (bz 691913).
Switch from ExcludeArch to ExclusiveArch %{ocaml_arches}.
Drop unnecessary spec file elements (BuildRoot, etc.).
Preserve timestamp on META.
2011-10-27 14:29:35 -06:00
Dennis Gilmore
99a5833028 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 19:40:18 -06:00
Richard W.M. Jones
40a889c7fd New upstream version 6.02.1. 2011-01-06 17:38:14 +00:00
Fedora Release Engineering
6f1ecee27e dist-git conversion 2010-07-29 04:43:05 +00:00
8 changed files with 347 additions and 218 deletions

13
.gitignore vendored
View File

@ -1 +1,12 @@
camlp5-5.12.tgz
/camlp5-6.12.tgz
/camlp5-6.13.tgz
/camlp5-6.14.tgz
/rel617.tar.gz
/rel700.tar.gz
/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

View File

@ -1,46 +0,0 @@
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 5 Jan 2010 17:17:57 +0100
Subject: [PATCH] Add (partial) OCaml 3.11.2 support
The full support is achieved by running the following commands after
extracting the tarball of version 5.12, before runing ./configure:
cp -a ocaml_stuff/3.11.1 ocaml_stuff/3.11.2
sed -i \
-e 's/let ocaml_version = "3.11.1"/let ocaml_version = "3.11.2"/' \
ocaml_stuff/3.11.2/utils/pconfig.ml
cp -a ocaml_src/main/ast2pt.ml_3.11.1 ocaml_src/main/ast2pt.ml_3.11.2
Signed-off-by: Stephane Glondu <steph@glondu.net>
---
main/ast2pt.ml | 2 +-
top/rprint.ml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/ast2pt.ml b/main/ast2pt.ml
index 3c1ae43..9f3af38 100644
--- a/main/ast2pt.ml
+++ b/main/ast2pt.ml
@@ -14,7 +14,7 @@ THEN
END;
IFDEF
- OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_12_0
+ OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_11_2 OR OCAML_3_12_0
THEN
DEFINE AFTER_OCAML_3_11
END;
diff --git a/top/rprint.ml b/top/rprint.ml
index c011b07..1a67480 100644
--- a/top/rprint.ml
+++ b/top/rprint.ml
@@ -11,7 +11,7 @@ THEN
DEFINE OCAML_3_08
END;
-IFDEF OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_12_0 THEN
+IFDEF OCAML_3_11 OR OCAML_3_11_0 OR OCAML_3_11_1 OR OCAML_3_11_2 OR OCAML_3_12_0 THEN
DEFINE AFTER_OCAML_3_11
END;
--

View File

@ -1,31 +0,0 @@
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 5 Jan 2010 17:27:36 +0100
Subject: [PATCH] Fix typos in manpage
---
man/camlp5.1.tpl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/camlp5.1.tpl b/man/camlp5.1.tpl
index 9fdf2ab..a10d718 100644
--- a/man/camlp5.1.tpl
+++ b/man/camlp5.1.tpl
@@ -107,7 +107,7 @@ object files (ending with .cmo or .cma). Several usage of these options
are authorized. They must precede the other options.
.LP
-An optionnal
+An optional
.B \-\-
may end the load options.
@@ -300,7 +300,7 @@ the command line as ".cmi" files. For example, how to add the the
OCaml module "str":
.nf
.ta 1c
- mkcamlp5 -custom str.cmi str.cma -cclib -lstr -o camlp5str
+ mkcamlp5 \-custom str.cmi str.cma \-cclib \-lstr \-o camlp5str
.fi
.LP
--

View File

@ -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)/."

View File

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

View File

@ -1,95 +0,0 @@
# Specifications for the "camlp5" preprocessor:
requires = ""
version = "[distributed with Ocaml]"
description = "Base for Camlp5 syntax extensions"
directory = "+camlp5"
# For the toploop:
archive(byte,toploop,camlp5o) = "camlp5o.cma"
archive(byte,toploop,camlp5r) = "camlp5r.cma"
# Scheme-like syntax:
# Do #predicates "syntax,camlp5scheme", followed by #require "camlp5"
archive(byte,toploop,camlp5scheme) = "camlp5sch.cma"
# Standard ML-like syntax:
# Do #predicates "syntax,camlp5sml", followed by #require "camlp5"
archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo"
# Lisp-like syntax:
# Do #predicates "syntax,camlp5lisp", followed by #require "camlp5"
archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo"
# For the preprocessor itself:
archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo"
preprocessor = "camlp5 -nolib"
package "gramlib" (
requires(toploop) = "camlp5"
version = "[distributed with Ocaml]"
description = "Grammar library to create syntax extensions"
archive(byte) = "gramlib.cma"
archive(byte,toploop) = "" # already contained in camlp5*.cma
archive(native) = "gramlib.cmxa"
)
package "quotations" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Quotations to create AST nodes"
archive(syntax,preprocessor) = "q_MLast.cmo"
archive(syntax,toploop) = "q_MLast.cmo"
)
package "phony_quotations" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Phony quotations"
archive(syntax,preprocessor) = "q_phony.cmo"
archive(syntax,toploop) = "q_phony.cmo"
)
package "extend" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: EXTEND the camlp5 grammar"
archive(syntax,preprocessor) = "pa_extend.cmo"
archive(syntax,toploop) = "pa_extend.cmo"
)
package "extfun" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Extensible functions"
archive(syntax,preprocessor) = "pa_extfun.cmo"
archive(syntax,toploop) = "pa_extfun.cmo"
)
package "fstream" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Functional stream parsers"
archive(syntax,preprocessor) = "pa_fstream.cmo"
archive(syntax,toploop) = "pa_fstream.cmo"
)
package "macro" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Conditional compilation"
archive(syntax,preprocessor) = "pa_macro.cmo"
archive(syntax,toploop) = "pa_macro.cmo"
)
package "unit_constraints" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Type constraints of type unit (revised syntax only)"
archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo"
archive(syntax,toploop,camlp5r) = "pa_ru.cmo"
error(syntax,-camlp5r) = "Not available"
)

View File

@ -1,27 +1,32 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%if !%{opt}
%global debug_package %{nil}
%endif
%global major 8
%global minor 00
Name: ocaml-camlp5
Version: 5.12
Release: 6%{?dist}
Version: %{major}.%{minor}
Release: 1%{?dist}
Summary: Classical version of camlp4 OCaml preprocessor
Group: Development/Libraries
License: BSD
URL: http://pauillac.inria.fr/~ddr/camlp5/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
URL: https://camlp5.github.io/
Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz
Source1: camlp5-META
Source0: https://github.com/camlp5/camlp5/archive/rel%{major}.%{minor}.tar.gz
# Support for OCaml 3.11.2 from Debian, not upstream yet.
Patch0: 0001-Add-partial-OCaml-3.11.2-support.patch
# Various fixes to the man page (from Debian, not upstream yet).
Patch1: 0002-Fix-typos-in-manpage.patch
# Kill -warn-error A
Patch0: camlp5-8.00-kill-warn-error.patch
BuildRequires: ocaml >= 3.11.2
# 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
@ -38,7 +43,6 @@ ocaml-camlp4 package.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
@ -48,48 +52,50 @@ developing applications that use %{name}.
%prep
%setup -q -n camlp5-%{version}
%setup -q -n camlp5-rel%{major}.%{minor}
%autopatch -p1
find . -name .gitignore -delete
%patch0 -p1
%patch1 -p1
# See top of Patch0 for details:
cp -a ocaml_stuff/3.11.1 ocaml_stuff/3.11.2
sed -i \
-e 's/let ocaml_version = "3.11.1"/let ocaml_version = "3.11.2"/' \
ocaml_stuff/3.11.2/utils/pconfig.ml
cp -a ocaml_src/main/ast2pt.ml_3.11.1 ocaml_src/main/ast2pt.ml_3.11.2
# Build with debug information
sed -i 's,WARNERR="",WARNERR="-g",' configure
sed -i 's,-linkall,& -g,g' top/Makefile
for fil in compile/compile.sh $(find . -name Makefile); do
sed -i 's,\$[({]OCAMLN[})]c,& -g,;s,\$[({]OCAMLN[})]opt,& -g,;s,LINKFLAGS=,&-g ,' $fil
done
%build
./configure
make all
# Upstream uses hand-written configure, grrrrrr.
./configure \
--prefix %{_prefix} \
--bindir %{_bindir} \
--libdir %{_libdir}/ocaml \
--mandir %{_mandir}
%if %opt
make opt
strip meta/camlp5r.opt etc/camlp5o.opt
make %{_smp_mflags} world.opt
%else
make %{_smp_mflags} world
%endif
%install
rm -rf $RPM_BUILD_ROOT
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}
cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/ocaml/camlp5/META
%clean
rm -rf $RPM_BUILD_ROOT
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
%defattr(-,root,root,-)
%doc README LICENSE
%license LICENSE
%doc README.md
%{_libdir}/ocaml/camlp5
%if %opt
%exclude %{_libdir}/ocaml/camlp5/*.a
@ -97,11 +103,11 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_libdir}/ocaml/camlp5/*.cmx
%endif
%exclude %{_libdir}/ocaml/camlp5/*.mli
%{_libdir}/ocaml/topfind.camlp5
%files devel
%defattr(-,root,root,-)
%doc README LICENSE CHANGES ICHANGES DEVEL UPGRADING
%doc CHANGES ICHANGES DEVEL UPGRADING doc/html
%if %opt
%{_libdir}/ocaml/camlp5/*.a
%{_libdir}/ocaml/camlp5/*.cmxa
@ -115,6 +121,239 @@ rm -rf $RPM_BUILD_ROOT
%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.
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 7.08-0.4.git9b9eb124c
- OCaml 4.08.1 (rc2) rebuild.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.08-0.3.git9b9eb124c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 7.08-0.2.git9b9eb124c
- OCaml 4.08.0 (final) rebuild.
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 7.08-0.1
- Update to prerelease of 7.08 which will support OCaml 4.08.
- Enable parallel builds.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 7.05-8
- Bump release and rebuild.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 7.05-7
- Bump release and rebuild.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 7.05-6
- OCaml 4.08.0 (beta 3) rebuild.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.05-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.05-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 7.05-3
- OCaml 4.07.0 (final) rebuild.
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 7.05-2
- New upstream version 7.05.
- Bump and rebuild for OCaml 4.07.0-rc1.
* Thu Apr 26 2018 Richard W.M. Jones <rjones@redhat.com> - 7.03-3
- OCaml 4.07.0-beta2 rebuild.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.03-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 7.03-1
- New upstream version 7.03.
- OCaml 4.06.0 rebuild.
* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 7.00-4
- OCaml 4.05.0 rebuild.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.00-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.00-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 7.00-1
- New upstream version 7.00, including support for
OCaml 4.04.2 rebuild.
* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 6.17-3
- OCaml 4.04.1 rebuild.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sat Dec 03 2016 Richard W.M. Jones <rjones@redhat.com> - 6.17-1
- New upstream version 6.17 with support for OCaml 4.04.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jul 30 2015 Richard W.M. Jones <rjones@redhat.com> - 6.14-1
- New upstream version 6.14.
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 6.13-3
- OCaml 4.02.3 rebuild.
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 6.13-2
- ocaml-4.02.2 final rebuild.
* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 6.13-1
- New upstream version 6.13.
- ocaml-4.02.2 rebuild.
* Fri May 15 2015 Ville Skyttä <ville.skytta@iki.fi> - 6.12-3
- Mark LICENSE as %%license, don't ship .gitignore
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 6.12-2
- ocaml-4.02.1 rebuild.
* Thu Nov 6 2014 Jerry James <loganjerry@gmail.com> - 6.12-1
- Update to 6.12 final
- Drop upstreamed patches (all but -kill-warn-error)
- Drop debuginfo workaround; fixed upstream
* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.5.git63a8c30f
- ocaml-4.02.0 final rebuild.
* Sun Aug 24 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.4.git63a8c30f
- Fixes for 4.02.0+rc1.
- Kill -warn-error everywhere hopefully.
- Update parsing/location.mli from OCaml sources.
- Fix release numbering.
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.git63a8c30f.3
- ocaml-4.02.0+rc1 rebuild.
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.12-0.git63a8c30f.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.git63a8c30f.1
- ocaml-4.02.0-0.8.git10e45753.fc22 build.
* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 6.12-0.git63a8c30f
- Rebase to 6.12 prerelease which supports OCaml 4.02.
- OCaml 4.02.0 beta rebuild.
- New source URL.
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Apr 15 2014 Richard W.M. Jones <rjones@redhat.com> - 6.11-3
- Remove ocaml_arches macro (RHBZ#1087794).
* Thu Apr 10 2014 Michel Normand <normand@linux.vnet.ibm.com> 6.11-2
- increase stack size for ppc64/ppc64le (RHBZ#1085850)
* Sat Sep 14 2013 Jerry James <loganjerry@gmail.com> - 6.11-1
- New upstream version 6.11 (provides OCaml 4.01.0 support)
- Build with debug information
- Drop upstreamed -typevar patch
- Upstream now provides its own META file
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.07-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.07-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Oct 17 2012 Jerry James <loganjerry@gmail.com> - 6.07-1
- New upstream version 6.07 (provides OCaml 4.00.1 support)
- Add -typevar patch to fix the build
* Sat Jul 28 2012 Richard W.M. Jones <rjones@redhat.com> - 6.06-4
- Rebuild for OCaml 4.00.0 official release.
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.06-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun Jun 10 2012 Richard W.M. Jones <rjones@redhat.com> - 6.06-2
- Rebuild for OCaml 4.00.0.
* Fri Jun 8 2012 Jerry James <loganjerry@gmail.com> - 6.06-1
- New upstream version 6.06 (provides OCaml 4.0 support)
- Add HTML documentation to the -devel package
* Fri Jan 06 2012 Richard W.M. Jones <rjones@redhat.com> - 6.02.3-2
- Rebuild for OCaml 3.12.1.
* Thu Oct 27 2011 Jerry James <loganjerry@gmail.com> - 6.02.3-1
- New upstream version 6.02.3 (bz 691913).
- Switch from ExcludeArch to ExclusiveArch %%{ocaml_arches}.
- Drop unnecessary spec file elements (BuildRoot, etc.).
- Preserve timestamp on META.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.02.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Jan 6 2011 Richard W.M. Jones <rjones@redhat.com> - 6.02.1-1
- New upstream version 6.02.1.
- Remove upstream patches (both upstream).
- Rebuild for OCaml 3.12.0.
* Wed Jan 13 2010 Richard W.M. Jones <rjones@redhat.com> - 5.12-6
- Ignore bogus provides Dynlink and Dynlinkaux.

View File

@ -1 +1 @@
28a86d4f1da8983b7fc773262fa52f1f camlp5-5.12.tgz
SHA512 (rel8.00.tar.gz) = 6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93