rpms/Glide3/devel Glide3-lib64.patch,NONE,1.1 Glide3.spec,1.6,1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13731

Modified Files:
	Glide3.spec 
Added Files:
	Glide3-lib64.patch 
Log Message:
Change -L/usr/X11R6/lib to -L/usr/X11R6/lib64 when building on x86_64

Glide3-lib64.patch:

--- NEW FILE Glide3-lib64.patch ---
--- Glide3/h3/glide3/src/makefile.autoconf.am.lib64	2005-05-09 08:24:27.000000000 +0200
+++ Glide3/h3/glide3/src/makefile.autoconf.am	2005-05-09 08:24:42.000000000 +0200
@@ -192,7 +192,7 @@
 WHOLE_LIBS = $(top_builddir)/swlibs/fxmisc/libfxmisc.la \
              $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
              $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
-LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
+LINK_LIBS  = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86dga -lXxf86vm
 
 CLEANFILES = fxinline.h fxgasm.h
 
--- Glide3/h5/glide3/src/makefile.autoconf.am.lib64	2005-05-09 08:23:42.000000000 +0200
+++ Glide3/h5/glide3/src/makefile.autoconf.am	2005-05-09 08:24:04.000000000 +0200
@@ -211,7 +211,7 @@
              $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
 			 $(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \
              $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
-LINK_LIBS  = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
+LINK_LIBS  = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86dga -lXxf86vm -lm
 
 CLEANFILES = fxinline.h fxgasm.h
 


Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Glide3.spec	5 May 2005 09:40:30 -0000	1.6
+++ Glide3.spec	9 May 2005 06:31:51 -0000	1.7
@@ -22,6 +22,7 @@
 Patch3:  Glide3-fixes.patch
 Patch4:  Glide3-gcc4.patch
 Patch5:  Glide3-amd3dnow.patch
+Patch6:  Glide3-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automake14 autoconf xorg-x11-devel
 
@@ -50,7 +51,9 @@
 %patch3 -p1 -b .fix
 %patch4 -p1 -b .gcc4
 %patch5 -p1 -b .amd3dnow
-
+%ifarch x86_64
+%patch6 -p1 -b .lib64
+%endif
 
 %build
 aclocal-1.4
@@ -152,11 +155,15 @@
 
 
 %changelog
-* Mon May  5 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
+* Mon May  9 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Change -L/usr/X11R6/lib to -L/usr/X11R6/lib64 when building on
+  x86_64 .
+
+* Thu May  5 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
 - More x86_64 fixes added to Glide-64bit.patch.
 - Removed ancient Conflicts: XFree86-libs = 4.1.0
 
-* Mon May  4 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
+* Wed May  4 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
 - Tested amd3dnow code on a voodoo2, works for me (tm). Enabled
   amd3dnow code on i386 for now.
 - Added FX_GLIDE_I386 AM-conditonal and define, only use and build