rpms/linuxwacom/devel linuxwacom-0.6.6-64-bit-fix.patch, 1.1, 1.2 linuxwacom.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13872

Modified Files:
	linuxwacom-0.6.6-64-bit-fix.patch linuxwacom.spec 
Log Message:
Update 64-bit patch to also remove another i386'ism

linuxwacom-0.6.6-64-bit-fix.patch:
 configure.in    |    8 ++++++++
 src/Makefile.am |    5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

Index: linuxwacom-0.6.6-64-bit-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom-0.6.6-64-bit-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linuxwacom-0.6.6-64-bit-fix.patch	10 Feb 2005 18:53:05 -0000	1.1
+++ linuxwacom-0.6.6-64-bit-fix.patch	13 Apr 2005 17:26:31 -0000	1.2
@@ -1,5 +1,5 @@
---- linuxwacom-0.6.6/src/Makefile.am.64-bit-fix	2005-02-10 13:41:36.857941372 -0500
-+++ linuxwacom-0.6.6/src/Makefile.am	2005-02-10 13:41:12.684536251 -0500
+--- linuxwacom-0.6.6/src/Makefile.am.64-bit-fix	2004-12-01 16:13:15.000000000 -0500
++++ linuxwacom-0.6.6/src/Makefile.am	2005-04-13 13:25:27.000000000 -0400
 @@ -47,6 +47,7 @@
  XORGSDK_DIR	=@WCM_XORGSDK@
  DEBUG_FLAGS	= -D__JEJ_DEBUG
@@ -8,6 +8,15 @@
  
  if WCM_ENV_XORGSDK
  DRIVER_INCLUDES = -I$(XORGSDK_DIR)/include
+@@ -85,7 +86,7 @@
+ 	gcc $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
+ 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
+ 		-I. $(DRIVER_INCLUDES) \
+-		-Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
++		-Dlinux -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
+ 		-D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE  -D_GNU_SOURCE \
+ 		-DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
+ 		-DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX \
 @@ -95,7 +96,7 @@
  		-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \
  		-DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG -DFUNCPROTO=15 \
@@ -17,8 +26,8 @@
  
  wacom_drv.o: $(XF86OBJS)
  	ld -r $(XF86OBJS) -o wacom_drv.o
---- linuxwacom-0.6.6/configure.in.64-bit-fix	2005-02-10 13:37:55.647851257 -0500
-+++ linuxwacom-0.6.6/configure.in	2005-02-10 13:39:12.824366029 -0500
+--- linuxwacom-0.6.6/configure.in.64-bit-fix	2004-12-01 16:10:12.000000000 -0500
++++ linuxwacom-0.6.6/configure.in	2005-04-13 13:24:12.000000000 -0400
 @@ -48,6 +48,13 @@
  dnl Check for ncurses
  AC_WCM_CHECK_NCURSES


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linuxwacom.spec	14 Mar 2005 22:33:53 -0000	1.12
+++ linuxwacom.spec	13 Apr 2005 17:26:31 -0000	1.13
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.6.6
 Epoch:		0
-Release:	3
+Release:	4
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -92,6 +92,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Wed Apr 13 2005 Kristian Høgsberg <krh at redhat.com> - 0:0.6.6-4
+- Update linuxwacom-0.6.6-64-bit-fix.patch to remove more i386'isms.
+
 * Mon Mar 14 2005 Kristian Høgsberg <krh at porkchop.devel.redhat.com> 0:0.6.6-3
 - Rebuilding with gcc 4.0.