rpms/xorg-x11-drv-trident/devel trident-1.3.2-dpms.patch, NONE, 1.1 xorg-x11-drv-trident.spec, 1.28, 1.29

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-trident/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9926

Modified Files:
	xorg-x11-drv-trident.spec 
Added Files:
	trident-1.3.2-dpms.patch 
Log Message:
* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.3.2-3
- trident-1.3.2-dpms.patch: Fix for new DPMS headers


trident-1.3.2-dpms.patch:
 trident_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE trident-1.3.2-dpms.patch ---
diff -up xf86-video-trident-1.3.2/src/trident_driver.c.jx xf86-video-trident-1.3.2/src/trident_driver.c
--- xf86-video-trident-1.3.2/src/trident_driver.c.jx	2009-05-28 14:21:06.000000000 -0400
+++ xf86-video-trident-1.3.2/src/trident_driver.c	2009-08-04 13:32:48.000000000 -0400
@@ -63,7 +63,7 @@
 
 #include "globals.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "xf86xv.h"
 


Index: xorg-x11-drv-trident.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xorg-x11-drv-trident.spec	27 Jul 2009 08:33:57 -0000	1.28
+++ xorg-x11-drv-trident.spec	4 Aug 2009 17:27:36 -0000	1.29
@@ -2,17 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 trident video driver
-Name:      xorg-x11-drv-trident
-Version:   1.3.2
-Release:   2%{?dist}.1
-URL:       http://www.x.org
-License: MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 trident video driver
+Name:       xorg-x11-drv-trident
+Version:    1.3.2
+Release:    3%{?dist}
+URL:        http://www.x.org
+License:    MIT
+Group:      User Interface/X Hardware Support
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   trident.xinf
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:    trident.xinf
+
+Patch0:     trident-1.3.2-dpms.patch
 
 ExcludeArch: s390 s390x
 
@@ -26,6 +28,7 @@ X.Org X11 trident video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .dpms
 
 %build
 %configure --disable-static
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Tue Aug 04 2009 Adam Jackson <ajax at redhat.com> 1.3.2-3
+- trident-1.3.2-dpms.patch: Fix for new DPMS headers
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild