diff --git a/.cvsignore b/.cvsignore index 5936a6e..99cde3c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lablgl-1.03.tar.gz +lablgl-1.04.tar.gz diff --git a/lablgl-tk8.5.patch b/lablgl-tk8.5.patch deleted file mode 100644 index 90dee4e..0000000 --- a/lablgl-tk8.5.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 afbf80f..e8e108d 100644 --- a/ocaml-lablgl.spec +++ b/ocaml-lablgl.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: ocaml-lablgl -Version: 1.03 -Release: 7%{?dist} +Version: 1.04 +Release: 1%{?dist} Summary: LablGL is an OpenGL interface for Objective Caml @@ -13,8 +13,6 @@ Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{vers BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x -Patch0: lablgl-tk8.5.patch - BuildRequires: freeglut-devel BuildRequires: ocaml BuildRequires: tcl-devel @@ -52,8 +50,7 @@ developing applications that use %{name}. %prep -%setup -q -n lablgl-%{version} -%patch0 -p1 +%setup -q -n lablGL-%{version} cat > Makefile.config < - 1.04-1 +- Rebuild for OCaml 3.11.1. +- New upstream version 1.04. +- Patch for Tk 8.5 is now upstream. + * Thu Apr 16 2009 S390x secondary arch maintainer - ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs (added sparc64 per request from the sparc maintainer) diff --git a/sources b/sources index d5af2f7..65b7169 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c16eb9298314b764851bc7d15fae88f lablgl-1.03.tar.gz +dcf05a0cffffdf06cbe0fe55f9eff974 lablgl-1.04.tar.gz