From 78b785a21a7cde715a201a5577bb810c2d863d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= <gemi@fedoraproject.org>
Date: Sat, 31 Dec 2005 23:45:56 +0000
Subject: [PATCH] new version 2.6.0

---
 .cvsignore   |  2 +-
 lablgtk.spec | 53 +++++++++++++++++++++++++++++++++++++++-------------
 sources      |  2 +-
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 51f8db8..fb4bb60 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz
diff --git a/lablgtk.spec b/lablgtk.spec
index 0ca06be..9d1da09 100644
--- a/lablgtk.spec
+++ b/lablgtk.spec
@@ -1,26 +1,33 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
-Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz
-Patch0:		lablgtk-gcc4.patch
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
+#Patch0:        lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  lablgl >= 1.02
+BuildRequires:  gtkglarea2-devel
+BuildRequires:  zlib-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -30,16 +37,28 @@ typed, yet very comfortable, object-oriented interface to gtk+. This
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,14 +81,22 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi@bluewin.ch> - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister <gemi@bluewin.ch> - 2.4.0-6
 - include META file
 
diff --git a/sources b/sources
index 73ef448..e4e3f01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz