From 219ed16bb237523744b4bfaf816e28dfe058dc05 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Sep 28 2009 15:35:05 +0000
Subject: New upstream 2.14.0


---

diff --git a/.cvsignore b/.cvsignore
index eb99eb1..ff910c8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lablgtk-2.12.0.tar.gz
+lablgtk-2.14.0.tar.gz
diff --git a/ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch b/ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch
deleted file mode 100644
index fa3ad69..0000000
--- a/ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur lablgtk-2.12.0.orig/src/ml_panel.c lablgtk-2.12.0/src/ml_panel.c
---- lablgtk-2.12.0.orig/src/ml_panel.c	2007-06-20 08:40:34.000000000 +0100
-+++ lablgtk-2.12.0/src/ml_panel.c	2009-02-06 11:46:19.000000000 +0000
-@@ -23,6 +23,7 @@
- #include <string.h>
- 
- #include <libgnomeui/gnome-client.h>
-+#include <libgnomeui/gnome-ui-init.h>
- #include <panel-applet.h>
- 
- #include <caml/mlvalues.h>
diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec
index 93c5df6..4ae410c 100644
--- a/ocaml-lablgtk.spec
+++ b/ocaml-lablgtk.spec
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-lablgtk
-Version:        2.12.0
-Release:        4%{?dist}
+Version:        2.14.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -12,15 +12,13 @@ License:        LGPLv2 with exceptions
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-%{version}.tar.gz
 
-Patch0:         ocaml-lablgtk-2.12.0-gnome-ui-init-header.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
 Obsoletes:      lablgtk <= 2.6.0-7
 Provides:       lablgtk = 2.6.0-7
 
-BuildRequires:	ncurses-devel
+BuildRequires:  ncurses-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtkglarea2-devel
@@ -74,8 +72,6 @@ developing applications that use %{name}.
 %prep
 %setup -q -n lablgtk-%{version}
 
-%patch0 -p1
-
 # version information in META file is wrong
 perl -pi -e 's|version="1.3.1"|version="%{version}"|' META
 
@@ -124,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/lablgtk2/*.cmi
 %{_libdir}/ocaml/lablgtk2/*.cma
+%{_libdir}/ocaml/lablgtk2/*.cmxs
 %{_libdir}/ocaml/stublibs/*.so
 %{_bindir}/gdk_pixbuf_mlsource
 %{_bindir}/lablgladecc2
@@ -156,6 +153,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 28 2009 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-1
+- New upstream version 2.14.0.
+- Patch to fix ml_panel.c is now upstream, so removed.
+- New *.cmxs files (dynamically linked OCaml native code) added to
+  the base package.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.12.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 6831cce..0d1a5e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e253128afee3cdc6e9b43c34b35984d  lablgtk-2.12.0.tar.gz
+8a26ab3b749ea86d06b2868112332c33  lablgtk-2.14.0.tar.gz