SPECS: xorg-xserver-server.spec - up to 1.0.99.2

[arekm]

Author: arekm                        Date: Sun Apr  2 10:46:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.0.99.2

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.35 SPECS/xorg-xserver-server.spec:1.36
--- SPECS/xorg-xserver-server.spec:1.35	Thu Mar 23 09:57:10 2006
+++ SPECS/xorg-xserver-server.spec	Sun Apr  2 12:46:54 2006
@@ -1,21 +1,21 @@
 # $Revision$, $Date$
+%define	mesa_version	6.5
 Summary:	X.org server
 Summary(pl):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.0.2
-Release:	0.2
+Version:	1.0.99.2
+Release:	0.1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	5cd3316f07ed32a05cbd69e73a71bc74
-Source1:	http://dl.sourceforge.net/mesa3d/MesaLib-6.4.2.tar.bz2
-# Source1-md5:	7674d2c603b5834259e4e5a820cefd5b
+# Source0-md5:	e19e7e7e923c6a549c0d114c3f5c498c
+Source1:	http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
+# Source1-md5:	61beda590bfc5b4a12e979d5f2d70d7a
 Source2:	xserver.pamd
 Patch0:		%{name}-ncurses.patch
 Patch1:		%{name}-symlinks.patch
 Patch2:		%{name}-xwrapper.patch
 Patch3:		%{name}-compositefastpath.patch
-Patch4:		Mesa-glx-x11-render-texture.diff
 URL:		http://xorg.freedesktop.org/
 # for glx headers
 BuildRequires:	Mesa-libGL-devel
@@ -62,7 +62,7 @@
 BuildRequires:	xorg-proto-recordproto-devel
 BuildRequires:	xorg-proto-renderproto-devel
 BuildRequires:	xorg-proto-resourceproto-devel
-BuildRequires:	xorg-proto-scrnsaverproto-devel
+BuildRequires:	xorg-proto-scrnsaverproto-devel >= 1.1.0
 BuildRequires:	xorg-proto-trapproto-devel
 BuildRequires:	xorg-proto-videoproto-devel
 BuildRequires:	xorg-proto-xcmiscproto-devel
@@ -211,9 +211,6 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
-cd Mesa-6.4.2
-%patch4 -p0
-cd ..
 
 %build
 %{__libtoolize}
@@ -227,7 +224,7 @@
 	--enable-lbx \
 	--enable-xevie \
 	--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
-	--with-mesa-source="`pwd`/Mesa-6.4.2"
+	--with-mesa-source="`pwd`/Mesa-%{mesa_version}"
 
 %{__make}
 
@@ -253,6 +250,7 @@
 %attr(755,root,root) %{_bindir}/X
 %attr(755,root,root) %{_bindir}/Xorg
 %attr(4755,root,root) %{_bindir}/Xwrapper
+%attr(755,root,root) %{_bindir}/cvt
 %attr(755,root,root) %{_bindir}/getconfig
 %attr(755,root,root) %{_bindir}/getconfig.pl
 %attr(755,root,root) %{_bindir}/gtf
@@ -295,6 +293,7 @@
 %config(missingok) /etc/security/console.apps/xserver
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/cvt.1*
 %{_mandir}/man1/getconfig.1x*
 %{_mandir}/man1/gtf.1x*
 %{_mandir}/man1/pcitweak.1x*
@@ -352,6 +351,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/04/02 10:46:54  arekm
+- up to 1.0.99.2
+
 Revision 1.35  2006/03/23 08:57:10  wiget
 - removed tun.patch (fixed upstream)
 - release 0.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-xserver-server.spec?r1=1.35&r2=1.36&f=u