rpms/ocaml-lablgl/devel lablgl-tk8.5.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ocaml-lablgl.spec, 1.6, 1.7 sources, 1.4, 1.5

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-lablgl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12194/devel

Modified Files:
	.cvsignore ocaml-lablgl.spec sources 
Added Files:
	lablgl-tk8.5.patch 
Log Message:
* Tue Feb 12 2008 Richard W.M. Jones <rjones at redhat.com> - 1.03-1
- New upstream version 1.03.
- Fix for Tk 8.5.
- Rebuild for OCaml 3.10.1.


lablgl-tk8.5.patch:

--- NEW FILE lablgl-tk8.5.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2005 00:42:51 -0000	1.4
+++ .cvsignore	13 Feb 2008 00:32:54 -0000	1.5
@@ -1 +1 @@
-lablgl-1.02.tar.gz
+lablgl-1.03.tar.gz


Index: ocaml-lablgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/ocaml-lablgl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-lablgl.spec	7 Sep 2007 09:08:32 -0000	1.6
+++ ocaml-lablgl.spec	13 Feb 2008 00:32:54 -0000	1.7
@@ -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 @@
 
 %prep
 %setup -q -n lablgl-%{version}
+%patch0 -p1
+
 cat > Makefile.config <<EOF
 CAMLC = ocamlc.opt
 CAMLOPT = ocamlopt.opt
@@ -147,6 +151,11 @@
 
 
 %changelog
+* Tue Feb 12 2008 Richard W.M. Jones <rjones at redhat.com> - 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 <gemi at bluewin.ch> - 1.02-15
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-lablgl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2005 00:42:51 -0000	1.4
+++ sources	13 Feb 2008 00:32:54 -0000	1.5
@@ -1 +1 @@
-b50e4e7d856c26bc4449151e4307b37b  lablgl-1.02.tar.gz
+1c16eb9298314b764851bc7d15fae88f  lablgl-1.03.tar.gz