SPECS: xorg-xserver-server.spec - partial 1.4.99.905 update; mesa source no...

[arekm]

Author: arekm                        Date: Mon Jun 30 20:55:31 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- partial 1.4.99.905 update; mesa source no longer needed but mesa headers are needed

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.127 SPECS/xorg-xserver-server.spec:1.128
--- SPECS/xorg-xserver-server.spec:1.127	Wed Jun 25 13:37:02 2008
+++ SPECS/xorg-xserver-server.spec	Mon Jun 30 22:55:26 2008
@@ -3,11 +3,11 @@
 %bcond_with	xprint	# broken, upstream doesn't intend to fix it
 
 # ABI versions, see hw/xfree86/common/xf86Module.h
-%define	xorg_xserver_server_ansic_abi		0.3
-%define	xorg_xserver_server_extension_abi	1.0
-%define	xorg_xserver_server_font_abi		0.5
-%define	xorg_xserver_server_videodrv_abi	4.0
-%define	xorg_xserver_server_xinput_abi		2.0
+%define	xorg_xserver_server_ansic_abi		0.4
+%define	xorg_xserver_server_extension_abi	1.1
+%define	xorg_xserver_server_font_abi		0.6
+%define	xorg_xserver_server_videodrv_abi	4.1
+%define	xorg_xserver_server_xinput_abi		2.1
 
 #
 # Conditional build:
@@ -16,20 +16,17 @@
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.4.99.902
+Version:	1.4.99.905
 Release:	0.1%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	60044ff0d0c0283f89e48eee600563e9
-%define		mesa_version	7.1.0
-# Source1:	http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
-Source1:	mesa-20080417.tar.bz2
-# Source1-md5:	c00a8fec549e2aebd4cdb2cd76225420
+# Source0-md5:	aa873a0d1571685959122aa101bd8b35
 Source2:	xserver.pamd
 Patch0:		%{name}-ncurses.patch
 Patch1:		%{name}-xwrapper.patch
 URL:		http://xorg.freedesktop.org/
+BuildRequires:	Mesa-libGL-devel >= 7.1.0
 # for glx headers
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	autoconf >= 2.57
@@ -270,7 +267,6 @@
 Summary(pl.UTF-8):	Biblioteka rozszerzenia GLX dla serwera X.org
 Group:		X11/Servers
 Requires:	%{name} = %{version}-%{release}
-Provides:	xorg-xserver-libglx(glapi) = %{mesa_version}
 Provides:	xorg-xserver-modules-libglx
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
@@ -285,7 +281,7 @@
 Biblioteka rozszerzenia GLX dla serwera X.org.
 
 %prep
-%setup -q -a1 -n xorg-server-%{version}
+%setup -q -n xorg-server-%{version}
 %patch0 -p1
 %patch1 -p0
 
@@ -342,9 +338,7 @@
 	--%{?with_xprint:en}%{!?with_xprint:dis}able-xprint \
 	--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
 	--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
-	--with-mesa-source="`pwd`/mesa" \
 	--with-xkb-output=/var/lib/xkb
-# --with-mesa-source="`pwd`/Mesa-%{mesa_version}" \
 
 %{__make}
 
@@ -496,6 +490,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2008/06/30 20:55:26  arekm
+- partial 1.4.99.905 update; mesa source no longer needed but mesa headers are needed
+
 Revision 1.127  2008/06/25 11:37:02  arekm
 - default is changing in upstream to enable but we want disable
 
================================================================

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