diff --git a/.cvsignore b/.cvsignore index f32a36c..5936a6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lablgl-1.02.tar.gz +lablgl-1.03.tar.gz diff --git a/lablgl-tk8.5.patch b/lablgl-tk8.5.patch new file mode 100644 index 0000000..90dee4e --- /dev/null +++ b/lablgl-tk8.5.patch @@ -0,0 +1,12 @@ +diff -ur lablgl-1.03/Togl/src/Togl/togl.c lablgl-1.03.new/Togl/src/Togl/togl.c +--- lablgl-1.03/Togl/src/Togl/togl.c 2006-03-23 00:39:27.000000000 +0000 ++++ lablgl-1.03.new/Togl/src/Togl/togl.c 2008-02-12 18:56:01.000000000 +0000 +@@ -153,6 +153,8 @@ + # include "tkInt8.3.h" + #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 + # include "tkInt8.4.h" ++#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==5 ++# include "tkInt8.4.h" + #else + Sorry, you will have to edit togl.c to include the right tkInt.h file + #endif diff --git a/ocaml-lablgl.spec b/ocaml-lablgl.spec index 2ac4844..dccaeb6 100644 --- a/ocaml-lablgl.spec +++ b/ocaml-lablgl.spec @@ -1,17 +1,19 @@ %define debug_package %{nil} Name: ocaml-lablgl -Version: 1.02 -Release: 15%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml Group: System Environment/Libraries License: BSD URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html -Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.02.tar.gz +Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: lablgl-tk8.5.patch + Obsoletes: lablgl <= 1.02-9 Provides: lablgl = 1.02-9 BuildRequires: freeglut-devel @@ -55,6 +57,8 @@ developing applications that use %{name}. %prep %setup -q -n lablgl-%{version} +%patch0 -p1 + cat > Makefile.config < - 1.03-1 +- New upstream version 1.03. +- Fix for Tk 8.5. +- Rebuild for OCaml 3.10.1. + * Fri Sep 7 2007 Gerard Milmeister - 1.02-15 - Rebuild diff --git a/sources b/sources index 11f459d..d5af2f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b50e4e7d856c26bc4449151e4307b37b lablgl-1.02.tar.gz +1c16eb9298314b764851bc7d15fae88f lablgl-1.03.tar.gz