- Include Debian patch to fix support for OCaml 3.11.2.
- Include Debian patch to fix typos in man page. - Replace %%define with %%global. - Use upstream RPM 4.8 OCaml dependency generator. - Put ./configure in %%build section.
This commit is contained in:
parent
8988429b73
commit
35db57463e
46
0001-Add-partial-OCaml-3.11.2-support.patch
Normal file
46
0001-Add-partial-OCaml-3.11.2-support.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
--
|
31
0002-Fix-typos-in-manpage.patch
Normal file
31
0002-Fix-typos-in-manpage.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
--
|
@ -1,24 +1,30 @@
|
|||||||
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||||
%define debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
|
||||||
Name: ocaml-camlp5
|
Name: ocaml-camlp5
|
||||||
Version: 5.12
|
Version: 5.12
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Classical version of camlp4 OCaml preprocessor
|
Summary: Classical version of camlp4 OCaml preprocessor
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://pauillac.inria.fr/~ddr/camlp5/
|
URL: http://pauillac.inria.fr/~ddr/camlp5/
|
||||||
Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz
|
|
||||||
Source1: camlp5-META
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
ExcludeArch: sparc64 s390 s390x
|
ExcludeArch: sparc64 s390 s390x
|
||||||
|
|
||||||
BuildRequires: ocaml >= 3.10.1, ocaml-ocamldoc
|
Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz
|
||||||
|
Source1: camlp5-META
|
||||||
|
|
||||||
%define _use_internal_dependency_generator 0
|
# Support for OCaml 3.11.2 from Debian, not upstream yet.
|
||||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
|
Patch0: 0001-Add-partial-OCaml-3.11.2-support.patch
|
||||||
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_extend
|
# Various fixes to the man page (from Debian, not upstream yet).
|
||||||
|
Patch1: 0002-Fix-typos-in-manpage.patch
|
||||||
|
|
||||||
|
BuildRequires: ocaml >= 3.11.2
|
||||||
|
BuildRequires: ocaml-ocamldoc
|
||||||
|
|
||||||
|
%global __ocaml_requires_opts -i Asttypes -i Parsetree
|
||||||
|
%global __ocaml_provides_opts -i Pa_extend
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Camlp5 is a preprocessor-pretty-printer of OCaml.
|
Camlp5 is a preprocessor-pretty-printer of OCaml.
|
||||||
@ -43,10 +49,20 @@ developing applications that use %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n camlp5-%{version}
|
%setup -q -n camlp5-%{version}
|
||||||
./configure
|
|
||||||
|
%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
|
%build
|
||||||
|
./configure
|
||||||
make all
|
make all
|
||||||
%if %opt
|
%if %opt
|
||||||
make opt
|
make opt
|
||||||
@ -99,6 +115,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 5 2010 Richard W.M. Jones <rjones@redhat.com> - 5.12-4
|
||||||
|
- Include Debian patch to fix support for OCaml 3.11.2.
|
||||||
|
- Include Debian patch to fix typos in man page.
|
||||||
|
- Replace %%define with %%global.
|
||||||
|
- Use upstream RPM 4.8 OCaml dependency generator.
|
||||||
|
- Put ./configure in %%build section.
|
||||||
|
|
||||||
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 5.12-3
|
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 5.12-3
|
||||||
- Rebuild for OCaml 3.11.2.
|
- Rebuild for OCaml 3.11.2.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user