packages (XORG_XSERVER_1_7): xorg-xserver-server/xorg-xserver-server.spec -...

[baggins]

Author: baggins                      Date: Thu Apr 29 10:57:59 2010 GMT
Module: packages                      Tag: XORG_XSERVER_1_7
---- Log message:
- backported builtin-SHA1 patch, don't pull openssl dep

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.217.2.5 -> 1.217.2.6) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.217.2.5 packages/xorg-xserver-server/xorg-xserver-server.spec:1.217.2.6
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.217.2.5	Wed Mar 17 07:43:22 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Thu Apr 29 12:57:54 2010
@@ -16,7 +16,7 @@
 %define	xorg_xserver_server_videodrv_abi	6.0
 %define	xorg_xserver_server_xinput_abi		7.0
 
-%define		rel		1
+%define		rel		2
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
@@ -32,6 +32,7 @@
 Patch2:		%{name}-fb-size.patch
 Patch3:		%{name}-less-acpi-brokenness.patch
 Patch4:		%{name}-ac.patch
+Patch5:		%{name}-builtin-SHA1.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.3
 # for glx headers
@@ -47,7 +48,6 @@
 %{?with_selinux:BuildRequires:	libselinux-devel >= 2.0.86}
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
-BuildRequires:	openssl-devel
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
 BuildRequires:	pixman-devel >= 0.16.0
@@ -332,6 +332,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0
+%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
@@ -541,6 +542,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.217.2.6  2010/04/29 10:57:54  baggins
+- backported builtin-SHA1 patch, don't pull openssl dep
+
 Revision 1.217.2.5  2010/03/17 06:43:22  arekm
 - up to 1.7.6
 
================================================================

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