SPECS: ocaml-lablgl.spec - switched to modular xorg - added tk85 p...

[qboosh]

Author: qboosh                       Date: Sat Dec  9 00:52:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- switched to modular xorg
- added tk85 patch to fix build with tk 8.5

---- Files affected:
SPECS:
   ocaml-lablgl.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/ocaml-lablgl.spec
diff -u SPECS/ocaml-lablgl.spec:1.25 SPECS/ocaml-lablgl.spec:1.26
--- SPECS/ocaml-lablgl.spec:1.25	Wed May 31 14:54:38 2006
+++ SPECS/ocaml-lablgl.spec	Sat Dec  9 01:52:15 2006
@@ -9,15 +9,16 @@
 Group:		Libraries
 Source0:	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-%{version}.tar.gz
 # Source0-md5:	b50e4e7d856c26bc4449151e4307b37b
+Patch0:		%{name}-tk85.patch
 URL:		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
-BuildRequires:	OpenGL-devel
-BuildRequires:	XFree86-devel
-BuildRequires:	glut-devel >= 3.7
+BuildRequires:	OpenGL-GLX-devel
+BuildRequires:	OpenGL-glut-devel >= 3.7
 BuildRequires:	ocaml >= %{ocaml_ver}
 BuildRequires:	ocaml-camlp4
 BuildRequires:	ocaml-labltk-devel
 BuildRequires:	tcl-devel
-BuildRequires:	tk-devel
+BuildRequires:	tk-devel >= 4.0
+BuildRequires:	xorg-lib-libXmu-devel
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,8 +62,8 @@
 Summary(pl):	Widget Tk dla lablGL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-%requires_eq	ocaml-runtime
 %requires_eq	ocaml-labltk
+%requires_eq	ocaml-runtime
 
 %description togl
 Togl Tk widget for lablGL, to be used with labltk.
@@ -151,10 +152,11 @@
 
 %prep
 %setup -q -n lablgl-%{version}
+%patch0 -p1
 
 %build
-sed -e 's|^TKINCLUDES|#&|;
-	s|^GLLIBS.*|GLLIBS = -L%{_prefix}/X11R6/%{_lib} -lGL -lGLU -lXmu|;
+sed -e 's|^\(X\|TK\)INCLUDES|#&|;
+	s|^GLLIBS.*|GLLIBS = -lGL -lGLU -lXmu|;
 	s|^COPTS.*|COPTS = %{rpmcflags} -c -fPIC|;' \
 	Makefile.config.ex > Makefile.config
 %{__make} -j1 all opt
@@ -243,6 +245,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/12/09 00:52:15  qboosh
+- switched to modular xorg
+- added tk85 patch to fix build with tk 8.5
+
 Revision 1.25  2006/05/31 12:54:38  glen
 - rel 4 (rebuild with ocaml-3.09.2)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ocaml-lablgl.spec?r1=1.25&r2=1.26&f=u