rpms/linuxwacom/devel linuxwacom-0.6.6-modular-sdk.patch, NONE, 1.1 linuxwacom.spec, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Author: krh

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

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.6.6-modular-sdk.patch 
Log Message:
Pathc build system to work with modular X sdk.

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

--- NEW FILE linuxwacom-0.6.6-modular-sdk.patch ---
--- linuxwacom-0.6.6/src/Makefile.am.modular-sdk	2005-11-18 15:20:21.000000000 -0500
+++ linuxwacom-0.6.6/src/Makefile.am	2005-11-18 15:20:30.000000000 -0500
@@ -50,7 +50,7 @@
 XSERVER64	=@WCM_XSERVER64@
 
 if WCM_ENV_XORGSDK
-DRIVER_INCLUDES = -I$(XORGSDK_DIR)/include
+DRIVER_INCLUDES = -I$(XORGSDK_DIR)
 endif
 
 if WCM_ENV_XF86
--- linuxwacom-0.6.6/acinclude.m4.modular-sdk	2005-11-18 15:20:49.000000000 -0500
+++ linuxwacom-0.6.6/acinclude.m4	2005-11-18 15:20:42.000000000 -0500
@@ -195,7 +195,7 @@
 AS_HELP_STRING([--with-xorg-sdk=dir], [Specify Xorg SDK directory]),
 [ WCM_XORGSDK="$withval"; ])
 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: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linuxwacom.spec	18 Nov 2005 19:59:55 -0000	1.21
+++ linuxwacom.spec	18 Nov 2005 20:23:47 -0000	1.22
@@ -16,6 +16,7 @@
 Patch0:		linuxwacom-0.6.4-linux-input.patch
 Patch1:		linuxwacom-0.6.6-configure-fixes.patch
 Patch2:		linuxwacom-0.6.6-64-bit-fix.patch
+Patch3:		linuxwacom-0.6.6-modular-sdk.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel, libXi-devel, xorg-x11-server-sdk, ncurses-devel
@@ -43,6 +44,7 @@
 %patch0 -p1 -b .linux-input
 %patch1 -p1 -b .configure-fixes
 %patch2 -p1 -b .64-bit-fix
+%patch3 -p1 -b .modular-sdk
 
 %build
 libtoolize --copy --force
@@ -95,6 +97,7 @@
 %changelog
 * Fri Nov 18 2005 Kristian Høgsberg <krh at redhat.com> 0:0.6.6-8
 - Update to work with new X11 paths.
+- Patch build system to work with modular X sdk.
 
 * Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0:0.6.6-7
 - require implementation independent Xserver instead of xorg-x11