rpms/linuxwacom/devel linuxwacom-fsp.patch, NONE, 1.1 linuxwacom.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-fsp.patch 
Log Message:
* 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
  doesn't like it.


linuxwacom-fsp.patch:
 Makefile.am |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linuxwacom-fsp.patch ---
--- linuxwacom-0.7.0/src/Makefile.am.fsp	2005-12-12 15:21:38.000000000 +0000
+++ linuxwacom-0.7.0/src/Makefile.am	2005-12-12 15:21:59.000000000 +0000
@@ -90,6 +90,7 @@
 
 $(XF86OBJS): xf86Wacom.c Makefile
 	$(CC) $(CFLAGS) $(DEPFLAGS) $(DLLOADER) -pipe -ansi \
+		-fno-stack-protector \
 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
 		-I.  $(DRIVER_INCLUDES) -Dlinux \
 		-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linuxwacom.spec	9 Dec 2005 11:03:01 -0000	1.24
+++ linuxwacom.spec	12 Dec 2005 15:31:32 -0000	1.25
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.7.0
 Epoch:		0
-Release:	1
+Release:	2
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -15,6 +15,7 @@
 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
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
@@ -42,6 +43,7 @@
 
 %patch0 -p1 -b .linux-input
 %patch1 -p1 -b .configure-fixes
+%patch2 -p1 -b .fsp
 %patch3 -p1 -b .modular-sdk
 
 %build
@@ -60,7 +62,7 @@
 %configure --without-gtk --without-tcl --without-tk \
 	--disable-wacomxi --disable-libwacomxi \
 	--with-xorg-sdk=%{_x11sdkdir} --with-xlib=%{_x11libdir} \
-	$XSERVER64
+	--enable-dlloader $XSERVER64
 
 export CFLAGS="$RPM_OPT_FLAGS"
 make XORG_SDK_DIR=%{_x11sdkdir}
@@ -68,7 +70,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall x86moduledir=$RPM_BUILD_ROOT%{_x11libdir}/modules/input
+%makeinstall x86moduledir=$RPM_BUILD_ROOT%{_x11libdir}/xorg/modules/input
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-wacom.rules
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
@@ -85,7 +87,7 @@
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README NEWS
-%attr(0444,root,root) %{_x11libdir}/modules/input/wacom_drv.o
+%attr(0444,root,root) %{_x11libdir}/xorg/modules/input/wacom_drv.*o
 %{_bindir}/wacdump
 %{_bindir}/xidump
 %{_bindir}/xsetwacom
@@ -99,6 +101,11 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* 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
+  doesn't like it.
+
 * Fri Dec  9 2005 Tim Waugh <twaugh at redhat.com> 0:0.7.0-1
 - 0.7.0.  No longer need 64-bit patch.
 - Fixed SDK path.