From 0411e7864f2c99a23b33ad63f62cd6955ae1cba6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 6 Jan 2012 15:33:38 +0000
Subject: [PATCH] New upstream version 0.3.4.

- Remove patch, now upstream.
---
 .gitignore                                  |  1 +
 ocaml-gettext-0.3.3-with-camomile-0.8.patch | 12 ------------
 ocaml-gettext.spec                          | 16 ++++++++--------
 sources                                     |  2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 ocaml-gettext-0.3.3-with-camomile-0.8.patch

diff --git a/.gitignore b/.gitignore
index e39aab8..a37d1e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ocaml-gettext-0.3.3.tar.gz
+/ocaml-gettext-0.3.4.tar.gz
diff --git a/ocaml-gettext-0.3.3-with-camomile-0.8.patch b/ocaml-gettext-0.3.3-with-camomile-0.8.patch
deleted file mode 100644
index 0fd6cb5..0000000
--- a/ocaml-gettext-0.3.3-with-camomile-0.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ocaml-gettext-0.3.3.old/libgettext-camomile-ocaml/gettextCamomile.ml	2008-04-29 23:32:41.000000000 +0100
-+++ ocaml-gettext-0.3.3/libgettext-camomile-ocaml/gettextCamomile.ml	2011-01-06 09:46:00.409235647 +0000
-@@ -21,8 +21,7 @@
- (**************************************************************************)
- 
- 
--open CamomileLibrary;;
--open Default.Camomile;;
-+open CamomileLibraryDefault.Camomile;;
- open GettextTypes;;
- 
- (** Error reported when something goes wrong during Camomile initialization.
diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec
index 8dd4f55..5b75e2a 100644
--- a/ocaml-gettext.spec
+++ b/ocaml-gettext.spec
@@ -2,20 +2,17 @@
 %define debug_package %{nil}
 
 Name:           ocaml-gettext
-Version:        0.3.3
-Release:        8%{?dist}
+Version:        0.3.4
+Release:        1%{?dist}
 Summary:        OCaml library for i18n
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
-URL:            http://sylvain.le-gall.net/ocaml-gettext.html
-Source0:        http://sylvain.le-gall.net/download/%{name}-%{version}.tar.gz
+URL:            http://forge.ocamlcore.org/projects/ocaml-gettext
+Source0:        http://forge.ocamlcore.org/frs/download.php/676/ocaml-gettext-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-# Fix for camomile 0.8.  Sent upstream on 2011-01-06.
-Patch0:         ocaml-gettext-0.3.3-with-camomile-0.8.patch
-
 BuildRequires:  ocaml >= 3.12.0-3
 BuildRequires:  ocaml-findlib-devel >= 1.2.1-3
 BuildRequires:  ocaml-ocamldoc
@@ -100,7 +97,6 @@ signature files for developing applications that use
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -218,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan  6 2012 Richard W.M. Jones <rjones@redhat.com> - 0.3.4-1
+- New upstream version 0.3.4.
+- Remove patch, now upstream.
+
 * Wed Dec 21 2011 Karsten Hopp <karsten@redhat.com> 0.3.3-8
 - fix configure line
 
diff --git a/sources b/sources
index 42de9f0..7334953 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1105a62770e6175490e79b803d59e0c  ocaml-gettext-0.3.3.tar.gz
+2c588ba92e9a809f2885ecacc48069a9  ocaml-gettext-0.3.4.tar.gz