commit 40a889c7fd564c572a33a484bc683ee55153a451
Author: Richard W.M. Jones <rjones@xxxxxxxxxx>
Date: Thu Jan 6 17:37:04 2011 +0000
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(-)
---
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/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 <rjones@xxxxxxxxxx> - 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@xxxxxxxxxx> - 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
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
