From c97e0e397cf84066ea540b3fd84d67bb0573cce7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Jan 2011 08:50:37 +0000
Subject: [PATCH] Update for OCaml 3.12.0.

---
 .gitignore                       |  1 +
 ocaml-calendar-2.01.1-META.patch | 13 -------------
 ocaml-calendar.spec              | 14 ++++++++------
 sources                          |  2 +-
 4 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 ocaml-calendar-2.01.1-META.patch

diff --git a/.gitignore b/.gitignore
index 2997b3f..59ba56a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 calendar-2.01.1.tar.gz
+/calendar-2.03.tar.gz
diff --git a/ocaml-calendar-2.01.1-META.patch b/ocaml-calendar-2.01.1-META.patch
deleted file mode 100644
index b296079..0000000
--- a/ocaml-calendar-2.01.1-META.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- calendar-2.01.1/Makefile.in.orig	2009-10-08 14:28:50.633555407 +0100
-+++ calendar-2.01.1/Makefile.in	2009-10-08 14:29:07.767560374 +0100
-@@ -114,8 +114,8 @@
- META: Makefile
- 	echo "description = \"$(NAME) library\"" > $@
- 	echo "version = \"$(VERSION)\"" >> $@
--	echo "archive(byte) = \"$(NAMELIB).cmo $(NAMELIB).cma\"" >> $@
--	echo "archive(native) = \"$(NAMELIB).cmx $(NAMELIB).cmxa\"" >> $@
-+	echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@
-+	echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@
- 	echo "requires = \"unix str\"" >> $@
- 
- # Generic rules
diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index 12ce6f3..8da58da 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -2,14 +2,14 @@
 %global debug_package %{nil}
 
 Name:           ocaml-calendar
-Version:        2.01.1
-Release:        5%{?dist}
+Version:        2.03
+Release:        1%{?dist}
 Summary:        Objective Caml library for managing dates and times
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://calendar.forge.ocamlcore.org/
-Source0:        http://forge.ocamlcore.org/frs/download.php/173/calendar-%{version}.tar.gz
+Source0:        http://forge.ocamlcore.org/frs/download.php/427/calendar-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
@@ -17,8 +17,6 @@ BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
-Patch0:         ocaml-calendar-2.01.1-META.patch
-
 # Ignore all generated modules *except* CalendarLib, since everything
 # now appears in that namespace.
 %global __ocaml_requires_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version
@@ -42,7 +40,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n calendar-%{version}
-%patch0 -p1
 
 
 %build
@@ -86,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan  6 2011 Richard W.M. Jones <rjones@redhat.com> - 2.03-1
+- New upstream version 2.03.
+- Rebuild for OCaml 3.12.0.
+- Remove META file patch, now upstream.
+
 * Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-5
 - Replace %%define with %%global.
 - Use upstream RPM 4.8 OCaml dependency generator.
diff --git a/sources b/sources
index e837447..de207ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a30974a97f718688198c5a5dc6235cff  calendar-2.01.1.tar.gz
+c594605758ff685ca84ea42c55a5aba8  calendar-2.03.tar.gz