packages: xorg-xserver-server/xorg-xserver-server.spec, xorg-xserver-server...

arekm arekm at pld-linux.org
Sat Jul 9 00:05:11 CEST 2011


Author: arekm                        Date: Fri Jul  8 22:05:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.10.3; nvidia-randr patch merged

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.280 -> 1.281) , xorg-xserver-server-nvidia-randr.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.280 packages/xorg-xserver-server/xorg-xserver-server.spec:1.281
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.280	Sun May 29 09:38:21 2011
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Sat Jul  9 00:05:05 2011
@@ -16,16 +16,16 @@
 %define	xorg_xserver_server_videodrv_abi	10.0
 %define	xorg_xserver_server_xinput_abi		12.2
 
-%define		rel	2
+%define		rel	1
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.10.2
+Version:	1.10.3
 Release:	%{rel}%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	c9ba50bd44ea70da51f13100336a5484
+# Source0-md5:	fc1bb18a09244cd43a998625a6a1b071
 Source1:	10-quirks.conf
 Source2:	xserver.pamd
 Source10:	%{name}-Xvfb.init
@@ -35,7 +35,6 @@
 Patch2:		%{name}-fb-size.patch
 Patch3:		%{name}-less-acpi-brokenness.patch
 Patch4:		%{name}-builtin-SHA1.patch
-Patch5:		%{name}-nvidia-randr.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -368,7 +367,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -618,6 +616,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.281  2011/07/08 22:05:05  arekm
+- up to 1.10.3; nvidia-randr patch merged
+
 Revision 1.280  2011/05/29 07:38:21  arekm
 - rel 2; replace nvidia hack with proper checks
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.280&r2=1.281&f=u



More information about the pld-cvs-commit mailing list