rpms/Glide3-libGL/FC-4 Glide3-libGL.spec, 1.4, 1.5 Mesa-6.2.1-config.patch, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25692

Modified Files:
	Glide3-libGL.spec Mesa-6.2.1-config.patch 
Log Message:
Use /usr/X11R6/lib64 when appropiate


Index: Glide3-libGL.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/FC-4/Glide3-libGL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Glide3-libGL.spec	18 Feb 2006 08:30:53 -0000	1.4
+++ Glide3-libGL.spec	18 Feb 2006 12:16:00 -0000	1.5
@@ -12,7 +12,7 @@
 Patch1:         Mesa-6.2.1-64bit.patch
 Patch2:         Mesa-6.2.1-antialias.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  xorg-x11-devel Glide3-devel libGL-devel
+#BuildRequires:  xorg-x11-devel Glide3-devel libGL-devel
 ExclusiveArch:  %{ix86} x86_64
  
 %description
@@ -45,7 +45,8 @@
 %else
   TARGET=linux-glide
 %endif
-make %{?_smp_mflags} LIB_DIR=\$\(TOP\)/%{_lib} ${TARGET}
+make %{?_smp_mflags} LIB_DIR=\$\(TOP\)/%{_lib} X11_LIB_DIR=/usr/X11R6/%{_lib} \
+  ${TARGET}
  
  
 %install

Mesa-6.2.1-config.patch:

Index: Mesa-6.2.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/FC-4/Mesa-6.2.1-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mesa-6.2.1-config.patch	18 Feb 2006 12:04:21 -0000	1.2
+++ Mesa-6.2.1-config.patch	18 Feb 2006 12:16:17 -0000	1.3
@@ -17,10 +17,12 @@
  
  # Library/program dependencies
 -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3 -lm -lpthread
- GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
- GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
+-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
++GL_LIB_DEPS = -L$(X11_LIB_DIR) -lX11 -lXext -lglide3 -lm -lpthread
++GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(X11_LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L$(X11_LIB_DIR) -lXt -lX11
 +APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
 --- Mesa-6.2.1/configs/default.config	2006-01-15 09:32:20.000000000 +0100
 +++ Mesa-6.2.1/configs/default	2006-01-15 09:32:53.000000000 +0100
@@ -50,8 +52,10 @@
  
  # Library/program dependencies
 -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3 -lm -lpthread
- GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
- GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
+-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
++GL_LIB_DEPS = -L$(X11_LIB_DIR) -lX11 -lXext -lglide3 -lm -lpthread
++GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(X11_LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L$(X11_LIB_DIR) -lXt -lX11
 +APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm