From 35db57463e8e0519d753f02d8e9ea8988d118550 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jan 2010 18:15:56 +0000 Subject: [PATCH] - 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. --- 0001-Add-partial-OCaml-3.11.2-support.patch | 46 +++++++++++++++++++++ 0002-Fix-typos-in-manpage.patch | 31 ++++++++++++++ ocaml-camlp5.spec | 43 ++++++++++++++----- 3 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 0001-Add-partial-OCaml-3.11.2-support.patch create mode 100644 0002-Fix-typos-in-manpage.patch diff --git a/0001-Add-partial-OCaml-3.11.2-support.patch b/0001-Add-partial-OCaml-3.11.2-support.patch new file mode 100644 index 0000000..542ef44 --- /dev/null +++ b/0001-Add-partial-OCaml-3.11.2-support.patch @@ -0,0 +1,46 @@ +From: Stephane Glondu +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 +--- + 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; + +-- diff --git a/0002-Fix-typos-in-manpage.patch b/0002-Fix-typos-in-manpage.patch new file mode 100644 index 0000000..d410cc7 --- /dev/null +++ b/0002-Fix-typos-in-manpage.patch @@ -0,0 +1,31 @@ +From: Stephane Glondu +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 + +-- diff --git a/ocaml-camlp5.spec b/ocaml-camlp5.spec index e51e773..d3987ec 100644 --- a/ocaml-camlp5.spec +++ b/ocaml-camlp5.spec @@ -1,24 +1,30 @@ -%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%define debug_package %{nil} +%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) +%global debug_package %{nil} Name: ocaml-camlp5 Version: 5.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Classical version of camlp4 OCaml preprocessor Group: Development/Libraries License: BSD 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) 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 -%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree -%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i Pa_extend +# 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 + +BuildRequires: ocaml >= 3.11.2 +BuildRequires: ocaml-ocamldoc + +%global __ocaml_requires_opts -i Asttypes -i Parsetree +%global __ocaml_provides_opts -i Pa_extend %description Camlp5 is a preprocessor-pretty-printer of OCaml. @@ -43,10 +49,20 @@ developing applications that use %{name}. %prep %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 +./configure make all %if %opt make opt @@ -99,6 +115,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 5 2010 Richard W.M. Jones - 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 - 5.12-3 - Rebuild for OCaml 3.11.2.