rpms/linuxwacom/devel linuxwacom-0.7.2-modular-sdk.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 linuxwacom.spec, 1.25, 1.26 sources, 1.4, 1.5 linuxwacom-0.6.4-linux-input.patch, 1.1, NONE linuxwacom-0.6.6-configure-fixes.patch, 1.4, NONE linuxwacom-0.6.6-modular-sdk.patch, 1.4, NONE

[fedora-cvs-commits at redhat.com]

Author: krh

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

Modified Files:
	.cvsignore linuxwacom.spec sources 
Added Files:
	linuxwacom-0.7.2-modular-sdk.patch 
Removed Files:
	linuxwacom-0.6.4-linux-input.patch 
	linuxwacom-0.6.6-configure-fixes.patch 
	linuxwacom-0.6.6-modular-sdk.patch 
Log Message:
* Fri Jan 13 2006 Kristian Høgsberg <krh at redhat.com> 0:0.7.2-1
- Update to version 0.7.2.
- Drop linuxwacom-0.6.4-linux-input.patch since the kernel headers now
  define EV_SYN.
- Update SDK patch to work with new modular paths.


linuxwacom-0.7.2-modular-sdk.patch:
 acinclude.m4    |    2 +-
 src/Makefile.am |    2 +-
 src/xf86Wacom.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linuxwacom-0.7.2-modular-sdk.patch ---
--- src/Makefile.am.modular-sdk	2006-01-13 14:10:02.000000000 -0500
+++ src/Makefile.am	2006-01-13 14:10:02.000000000 -0500
@@ -52,7 +52,7 @@
 XSERVER64	=@WCM_XSERVER64@
 
 if WCM_ENV_XORGSDK
-DRIVER_INCLUDES = -I$(XORGSDK_DIR)/include
+DRIVER_INCLUDES = -I$(XORGSDK_DIR)
 endif
 
 if WCM_ENV_XF86
--- src/xf86Wacom.h.modular-sdk	2006-01-13 14:10:22.000000000 -0500
+++ src/xf86Wacom.h	2006-01-13 14:10:31.000000000 -0500
@@ -79,7 +79,7 @@
 #include <xf86_OSproc.h>
 #include <xf86Xinput.h>
 #include <exevents.h>           /* Needed for InitValuator/Proximity stuff */
-#include <keysym.h>
+#include <X11/keysym.h>
 #include <mipointer.h>
 
 #ifdef XFree86LOADER
--- acinclude.m4.modular-sdk	2005-12-21 18:04:36.000000000 -0500
+++ acinclude.m4	2006-01-13 14:10:02.000000000 -0500
@@ -220,7 +220,7 @@
 
 	if test -n "$WCM_XORGSDK"; then
 		AC_MSG_CHECKING(for valid Xorg SDK)
-		if test -f $WCM_XORGSDK/include/xf86Version.h; then
+		if test -f $WCM_XORGSDK/xf86Version.h; then
 			WCM_ENV_XORGSDK=yes
 			AC_MSG_RESULT(ok)
 		elif test -f $WCM_XORGSDK/xc/include/xf86Version.h; then


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Dec 2005 11:03:01 -0000	1.4
+++ .cvsignore	13 Jan 2006 19:23:30 -0000	1.5
@@ -1,2 +1 @@
-linuxwacom-0.6.6.tar.bz2
-linuxwacom-0.7.0-1.tar.bz2
+linuxwacom-0.7.2.tar.bz2


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linuxwacom.spec	12 Dec 2005 15:31:32 -0000	1.25
+++ linuxwacom.spec	13 Jan 2006 19:23:30 -0000	1.26
@@ -1,22 +1,20 @@
 %define _x11dir		/usr
 %define _x11libdir	%{_x11dir}/%{_lib}
-%define _x11sdkdir	/usr/include/xorg/sdk
+%define _x11sdkdir	%(pkg-config --variable=sdkdir xorg-server)
 
 Name:		linuxwacom
-Version:	0.7.0
+Version:	0.7.2
 Epoch:		0
-Release:	2
+Release:	1
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
 License:	GPL/X11
 URL:		http://linuxwacom.sourceforge.net
-Source0:	http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-0.7.0-1.tar.bz2
+Source0:	http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-%{version}.tar.bz2
 Source1:	10-wacom.rules
-Patch0:		linuxwacom-0.6.4-linux-input.patch
-Patch1:		linuxwacom-0.6.6-configure-fixes.patch
 Patch2:		linuxwacom-fsp.patch
-Patch3:		linuxwacom-0.6.6-modular-sdk.patch
+Patch3:		linuxwacom-0.7.2-modular-sdk.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel, libXi-devel, xorg-x11-server-sdk, ncurses-devel
@@ -41,10 +39,8 @@
 %prep
 %setup -q 
 
-%patch0 -p1 -b .linux-input
-%patch1 -p1 -b .configure-fixes
 %patch2 -p1 -b .fsp
-%patch3 -p1 -b .modular-sdk
+%patch3 -p0 -b .modular-sdk
 
 %build
 libtoolize --copy --force
@@ -101,6 +97,12 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Fri Jan 13 2006 Kristian Høgsberg <krh at redhat.com> 0:0.7.2-1
+- Update to version 0.7.2.
+- Drop linuxwacom-0.6.4-linux-input.patch since the kernel headers now
+  define EV_SYN.
+- Update SDK patch to work with new modular paths.
+
 * Mon Dec 12 2005 Tim Waugh <twaugh at redhat.com> 0:0.7.0-2
 - More SDK path fixes.
 - Don't build input driver with -fstack-protector since the X loader


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Dec 2005 11:03:01 -0000	1.4
+++ sources	13 Jan 2006 19:23:30 -0000	1.5
@@ -1 +1 @@
-9b9a12b606818858bc6c72011975a5bc  linuxwacom-0.7.0-1.tar.bz2
+3f6290101d5712a24097243ca9f092ed  linuxwacom-0.7.2.tar.bz2


--- linuxwacom-0.6.4-linux-input.patch DELETED ---


--- linuxwacom-0.6.6-configure-fixes.patch DELETED ---


--- linuxwacom-0.6.6-modular-sdk.patch DELETED ---