rpms/tachyon/EL-5 tachyon-rpm.patch,1.1,1.2 tachyon.spec,1.1,1.2

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/tachyon/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12556

Modified Files:
	tachyon-rpm.patch tachyon.spec 
Log Message:
- sync with EL-4 branch

tachyon-rpm.patch:

Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-5/tachyon-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tachyon-rpm.patch	30 Nov 2006 11:52:52 -0000	1.1
+++ tachyon-rpm.patch	16 Jul 2007 19:11:24 -0000	1.2
@@ -168,7 +168,7 @@
 +	"RANLIB = ranlib" \
 +	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
 +
-+# Linux AMD64/EM64T using LAM MPI
++# Linux PPC using LAM MPI
 +linux-ppc-lam:
 +	$(MAKE) all \
 +	"ARCH = linux-ppc-lam" \
@@ -180,7 +180,7 @@
 +	"RANLIB = ranlib" \
 +	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
 +
-+# Linux AMD64/EM64T using LAM MPI, with OpenGL display
++# Linux PPC using LAM MPI, with OpenGL display
 +linux-ppc-lam-ogl:
 +	$(MAKE) all \
 +	"ARCH = linux-ppc-lam-ogl" \
@@ -250,25 +250,14 @@
  ##########################################################################
 --- tachyon/unix/Make-opengl.r	2004-02-04 07:36:06.000000000 +0100
 +++ tachyon/unix/Make-opengl	2006-11-29 19:51:01.000000000 +0100
-@@ -9,8 +9,8 @@
- #
- # Generic Mesa OpenGL / GLX include and link specs, for most platforms
- #
--MESA_GLX_INCS = -I/usr/local/include
--MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
-+MESA_GLX_INCS = 
-+MESA_GLX_LIBS = -lGL -lGLU -lX11
- 
- 
- #
 @@ -37,8 +37,8 @@
  #
  # Linux OpenGL / GLX include and link specs
  #
 -LINUX_GLX_INCS = -I/usr/X11R6/include
 -LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11
-+LINUX_GLX_INCS = 
-+LINUX_GLX_LIBS = -lGL -lGLU -lX11
++LINUX_GLX_INCS = -I/usr/X11R6/include
++LINUX_GLX_LIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lGL -lGLU -lX11
  
  
  #


Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/EL-5/tachyon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tachyon.spec	30 Nov 2006 11:52:52 -0000	1.1
+++ tachyon.spec	16 Jul 2007 19:11:24 -0000	1.2
@@ -11,14 +11,14 @@
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.97
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
 Patch0: %{name}-rpm.patch
 License: BSD
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-BuildRequires: mesa-libGLU-devel
+BuildRequires: xorg-x11-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lam-devel
@@ -139,6 +139,9 @@
 %{_datadir}/tachyon
 
 %changelog
+* Mon Jul 16 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-3
+- sync with EL-4 branch
+
 * Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-2
 - use only kosher CFLAGS
 - fix target setting