rpms/linuxwacom/devel linuxwacom-0.8.2.1-fix_build.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 linuxwacom-0.7.8.3-sdk-me-harder.patch, 1.3, 1.4 linuxwacom.spec, 1.67, 1.68 sources, 1.14, 1.15 linuxwacom-0.7.6.3-delibcwrap.patch, 1.2, NONE linuxwacom-0.8.0.3-build-fixes.patch, 1.1, NONE linuxwacom-0.8.0.3-nocrash-removal.patch, 1.1, NONE linuxwacom-disable_stack_protector.patch, 1.2, NONE linuxwacom-dont_call_devproc_again_in_uninit.patch, 1.1, NONE

Aristeu Sergio Rozanski Filho arozansk at fedoraproject.org
Thu Jan 15 21:03:23 UTC 2009


Author: arozansk

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17413

Modified Files:
	.cvsignore linuxwacom-0.7.8.3-sdk-me-harder.patch 
	linuxwacom.spec sources 
Added Files:
	linuxwacom-0.8.2.1-fix_build.patch 
Removed Files:
	linuxwacom-0.7.6.3-delibcwrap.patch 
	linuxwacom-0.8.0.3-build-fixes.patch 
	linuxwacom-0.8.0.3-nocrash-removal.patch 
	linuxwacom-disable_stack_protector.patch 
	linuxwacom-dont_call_devproc_again_in_uninit.patch 
Log Message:
* new production release



linuxwacom-0.8.2.1-fix_build.patch:

--- NEW FILE linuxwacom-0.8.2.1-fix_build.patch ---
---
 src/xdrv/wcmConfig.c |    2 +-
 src/xdrv/xf86Wacom.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- linuxwacom-0.8.2-1.orig/src/xdrv/xf86Wacom.h	2009-01-15 14:57:45.000000000 -0500
+++ linuxwacom-0.8.2-1/src/xdrv/xf86Wacom.h	2009-01-15 14:59:33.000000000 -0500
@@ -23,7 +23,7 @@
 /****************************************************************************/
 
 #include "../include/xdrv-config.h"
-#ifdef WCM_XORG_XSERVER_1_6
+#ifdef WCM_XORG
    #include <xorg-server.h>
    #include <xorgVersion.h>
 #else
--- linuxwacom-0.8.2-1.orig/src/xdrv/wcmConfig.c	2008-12-30 16:46:01.000000000 -0500
+++ linuxwacom-0.8.2-1/src/xdrv/wcmConfig.c	2009-01-15 15:11:13.000000000 -0500
@@ -994,7 +994,7 @@ static XF86ModuleVersionInfo xf86WcmVers
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-#ifdef WCM_XORG_XSERVER_1_6
+#ifdef WCM_XORG
 	XORG_VERSION_CURRENT,
 #else
 	XF86_VERSION_CURRENT,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Oct 2008 15:07:10 -0000	1.14
+++ .cvsignore	15 Jan 2009 21:02:53 -0000	1.15
@@ -1,3 +1,4 @@
 linuxwacom-0.7.9-8.tar.bz2
 linuxwacom-0.8.1-4.tar.bz2
 linuxwacom-0.8.0-3.tar.bz2
+linuxwacom-0.8.2-1.tar.bz2

linuxwacom-0.7.8.3-sdk-me-harder.patch:

Index: linuxwacom-0.7.8.3-sdk-me-harder.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-0.7.8.3-sdk-me-harder.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linuxwacom-0.7.8.3-sdk-me-harder.patch	1 Oct 2008 14:49:20 -0000	1.3
+++ linuxwacom-0.7.8.3-sdk-me-harder.patch	15 Jan 2009 21:02:53 -0000	1.4
@@ -3,8 +3,8 @@
  src/xdrv/Makefile.am |    2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
---- linuxwacom-0.8.0-1.orig/src/xdrv/Makefile.am	2008-05-09 16:54:11.000000000 -0400
-+++ linuxwacom-0.8.0-1/src/xdrv/Makefile.am	2008-05-12 13:33:42.000000000 -0400
+--- linuxwacom-0.8.2-1.orig/src/xdrv/Makefile.am	2009-01-15 10:50:54.000000000 -0500
++++ linuxwacom-0.8.2-1/src/xdrv/Makefile.am	2009-01-15 10:51:04.000000000 -0500
 @@ -15,7 +15,7 @@ EXTRA_DIST = xf86Wacom.c wcmXCommand.c x
  		../include/Xwacom.h
  
@@ -14,11 +14,11 @@
  endif
  
  if WCM_ENV_XFREE86
---- linuxwacom-0.8.0-1.orig/configure.in	2008-05-09 16:54:11.000000000 -0400
-+++ linuxwacom-0.8.0-1/configure.in	2008-05-12 13:32:58.000000000 -0400
-@@ -589,6 +589,9 @@ if test "$WCM_ENV_XFREE86" != yes; then
+--- linuxwacom-0.8.2-1.orig/configure.in	2009-01-15 10:50:54.000000000 -0500
++++ linuxwacom-0.8.2-1/configure.in	2009-01-15 10:51:04.000000000 -0500
+@@ -646,6 +646,9 @@ if test -f $WCM_XLIB_DIR/libxf86config.a
+ 	fi
  fi
- AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes])
  
 +PKG_CHECK_MODULES(XORG, [xorg-server])
 +AC_SUBST([XORG_CFLAGS])


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- linuxwacom.spec	6 Jan 2009 01:02:10 -0000	1.67
+++ linuxwacom.spec	15 Jan 2009 21:02:53 -0000	1.68
@@ -1,9 +1,9 @@
-%define tarname		%{name}-0.8.0-3
+%define tarname		%{name}-0.8.2-1
 
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
-Version:	0.8.0.3
-Release:	7%{?dist}
+Version:	0.8.2.1
+Release:	1%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -12,16 +12,13 @@
 Source0:	http://prdownloads.sourceforge.net/linuxwacom/%{tarname}.tar.bz2
 Source1:	60-wacom.rules
 Source2:	10-linuxwacom.fdi
-Patch1:		linuxwacom-0.7.6.3-delibcwrap.patch
-Patch3:		linuxwacom-0.7.8.3-sdk-me-harder.patch
-Patch4:		linuxwacom-0.7.9.7-fix_build.patch
-Patch5:		linuxwacom-dont_call_devproc_again_in_uninit.patch
-Patch6:		linuxwacom-0.8.0.3-build-fixes.patch
-Patch7:		linuxwacom-0.8.0.3-nocrash-removal.patch
+Patch1:		linuxwacom-0.7.8.3-sdk-me-harder.patch
+Patch2:		linuxwacom-0.7.9.7-fix_build.patch
+Patch3:		linuxwacom-0.8.2.1-fix_build.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
-BuildRequires:  xorg-x11-server-sdk >= 1.5.99.1
+BuildRequires:  xorg-x11-server-devel >= 1.5.99.1
 BuildRequires:  autoconf automake libtool xorg-x11-server-Xorg
 Requires:	xorg-x11-server-Xorg >= 1.5.99.1, udev >= 030-21
 ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc ppc64 sparcv9 sparc64
@@ -44,12 +41,9 @@
 %prep
 %setup -q -n %{tarname}
 
-#patch1 -p1 -b .delibcwrap
-%patch3 -p1 -b .sdk
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .buildfixes
-%patch7 -p1 -b .nocrash-removal
+%patch1 -p1 -b .sdk
+%patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -111,6 +105,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Jan 15 2009 Aristeu Rozanski <aris at redhat.com> 0.8.1.2-1
+- new production release
+
 * Tue Jan 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-7
 - linuxwacom-0.8.0.3-nocrash-removal.patch: don't free the device's private,
   it causes a SIGABRT on device removal and the server does it anyway.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Oct 2008 15:07:10 -0000	1.14
+++ sources	15 Jan 2009 21:02:53 -0000	1.15
@@ -1,3 +1 @@
-8cb221a7ac21d92fa4ddcc3a709ce22c  linuxwacom-0.7.9-8.tar.bz2
-ea919f0b6448e22ff9aac98ac45c6eea  linuxwacom-0.8.1-4.tar.bz2
-629698976f9eb7d861802b22669c5aee  linuxwacom-0.8.0-3.tar.bz2
+c06a12b029b7ad8c879e08042d5c4a46  linuxwacom-0.8.2-1.tar.bz2


--- linuxwacom-0.7.6.3-delibcwrap.patch DELETED ---


--- linuxwacom-0.8.0.3-build-fixes.patch DELETED ---


--- linuxwacom-0.8.0.3-nocrash-removal.patch DELETED ---


--- linuxwacom-disable_stack_protector.patch DELETED ---


--- linuxwacom-dont_call_devproc_again_in_uninit.patch DELETED ---




More information about the scm-commits mailing list