From 40a889c7fd564c572a33a484bc683ee55153a451 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 6 Jan 2011 17:37:04 +0000 Subject: [PATCH] New upstream version 6.02.1. --- .gitignore | 1 + 0001-Add-partial-OCaml-3.11.2-support.patch | 46 --------------------- 0002-Fix-typos-in-manpage.patch | 31 -------------- ocaml-camlp5.spec | 26 ++++-------- sources | 2 +- 5 files changed, 10 insertions(+), 96 deletions(-) delete mode 100644 0001-Add-partial-OCaml-3.11.2-support.patch delete mode 100644 0002-Fix-typos-in-manpage.patch diff --git a/.gitignore b/.gitignore index b0322eb..386d663 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ camlp5-5.12.tgz +/camlp5-6.02.1.tgz diff --git a/0001-Add-partial-OCaml-3.11.2-support.patch b/0001-Add-partial-OCaml-3.11.2-support.patch deleted file mode 100644 index 542ef44..0000000 --- a/0001-Add-partial-OCaml-3.11.2-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index d410cc7..0000000 --- a/0002-Fix-typos-in-manpage.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 5766b12..eab385d 100644 --- a/ocaml-camlp5.spec +++ b/ocaml-camlp5.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: ocaml-camlp5 -Version: 5.12 -Release: 6%{?dist} +Version: 6.02.1 +Release: 1%{?dist} Summary: Classical version of camlp4 OCaml preprocessor Group: Development/Libraries @@ -15,12 +15,7 @@ ExcludeArch: sparc64 s390 s390x Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz Source1: camlp5-META -# 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 >= 3.12.0 BuildRequires: ocaml-ocamldoc %global __ocaml_requires_opts -i Asttypes -i Parsetree -i Pa_extend @@ -50,16 +45,6 @@ developing applications that use %{name}. %prep %setup -q -n camlp5-%{version} -%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 @@ -115,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 6 2011 Richard W.M. Jones - 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 - 5.12-6 - Ignore bogus provides Dynlink and Dynlinkaux. diff --git a/sources b/sources index ed8ca49..589ea8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28a86d4f1da8983b7fc773262fa52f1f camlp5-5.12.tgz +58913a5a581a3ce9cdad7d6bae5b6709 camlp5-6.02.1.tgz