From 47d162d1db0dc88fa1d5b78b35a5bc4bd9faefbe Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 12 Feb 2008 22:10:02 +0000
Subject: [PATCH] - New upstream version 1.2.1.

---
 .cvsignore                |  2 +-
 findlib-camlp4-path.patch | 11 -----------
 ocaml-findlib.spec        | 14 +++++++-------
 sources                   |  2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 findlib-camlp4-path.patch

diff --git a/.cvsignore b/.cvsignore
index 0badd6d..99c072a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-findlib-1.1.2pl1.tar.gz
+findlib-1.2.1.tar.gz
diff --git a/findlib-camlp4-path.patch b/findlib-camlp4-path.patch
deleted file mode 100644
index 769f5b0..0000000
--- a/findlib-camlp4-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- findlib-1.1.2pl1/src/findlib/Makefile.orig	2007-08-02 13:25:46.000000000 +0100
-+++ findlib-1.1.2pl1/src/findlib/Makefile	2007-08-02 13:25:25.000000000 +0100
-@@ -15,7 +15,7 @@
- OCAMLOPT = ocamlopt
- OCAMLDEP = ocamldep
- OCAMLLEX = ocamllex
--CAMLP4O =  camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
-+CAMLP4O =  camlp4 -I `ocamlc -where`/camlp4/Camlp4Parsers/ pa_o.cmo pa_op.cmo pr_o.cmo --
- #CAMLP4O =  camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo --
- 
- 
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index b9da556..5da4a00 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -2,20 +2,18 @@
 %define debug_package %{nil}
 
 Name:           ocaml-findlib
-Version:        1.1.2pl1
-Release:        14%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.ocaml-programming.de/packages/
-Source0:        http://www.ocaml-programming.de/packages/findlib-1.1.2pl1.tar.gz
+Source0:        http://www.ocaml-programming.de/packages/findlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-Patch0:         findlib-camlp4-path.patch
-
-BuildRequires:  ocaml >= 3.10.0-6
+BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-labltk-devel
 BuildRequires:  ocaml-ocamldoc
@@ -43,7 +41,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n findlib-%{version}
-%patch0 -p1
 
 
 %build
@@ -110,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 12 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-1
+- New upstream version 1.2.1.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-14
 - Ignore Parsetree module, it's a part of the toplevel.
 
diff --git a/sources b/sources
index 86b9840..6f17773 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df4c9176e9d5b8a6d37668d108fae923  findlib-1.1.2pl1.tar.gz
+fa580a4c1fc28c06fe79aa1c98b6ef2d  findlib-1.2.1.tar.gz