rpms/linuxwacom/devel linuxwacom-0.6.6-64-bit-fix.patch, 1.2, 1.3 linuxwacom.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	linuxwacom-0.6.6-64-bit-fix.patch linuxwacom.spec 
Log Message:
Build fixes.


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linuxwacom-0.6.6-64-bit-fix.patch	13 Apr 2005 17:26:31 -0000	1.2
+++ linuxwacom-0.6.6-64-bit-fix.patch	13 Apr 2005 18:29:11 -0000	1.3
@@ -1,5 +1,5 @@
 --- 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
++++ linuxwacom-0.6.6/src/Makefile.am	2005-04-13 14:15:40.000000000 -0400
 @@ -47,6 +47,7 @@
  XORGSDK_DIR	=@WCM_XORGSDK@
  DEBUG_FLAGS	= -D__JEJ_DEBUG
@@ -27,13 +27,13 @@
  wacom_drv.o: $(XF86OBJS)
  	ld -r $(XF86OBJS) -o wacom_drv.o
 --- 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
++++ linuxwacom-0.6.6/configure.in	2005-04-13 14:26:46.000000000 -0400
 @@ -48,6 +48,13 @@
  dnl Check for ncurses
  AC_WCM_CHECK_NCURSES
  
 +dnl Check for 64 bit server
-+AC_ARG_VAR(ac_cv_sizeof_long, [sizeof(long)])
++AC_CHECK_SIZEOF(long)
 +if test x$ac_cv_sizeof_long != x4; then
 +   WCM_XSERVER64="-D_XSERVER64 -DDDXTIME"
 +fi


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linuxwacom.spec	13 Apr 2005 17:26:31 -0000	1.13
+++ linuxwacom.spec	13 Apr 2005 18:29:11 -0000	1.14
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.6.6
 Epoch:		0
-Release:	4
+Release:	5
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -48,6 +48,7 @@
 libtoolize --copy --force
 aclocal
 autoconf
+automake --foreign
 
 export RPM_LIBDIR=%{_lib}
 %configure --without-gtk --without-tcl --without-tk \
@@ -92,6 +93,10 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Wed Apr 13 2005 Kristian Høgsberg <krh at redhat.com> - 0:0.6.6-5
+- Run automake so changes to Makefile.am take effect.
+- Fix configure.in test for 64 bit longs.
+
 * 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.