Author: blino
Date: Tue Feb 13 21:59:42 2007
New Revision: 120640
Added:
packages/cooker/x11-server-xgl/current/SOURCES/xgl-20070105.tar.bz2
(contents, props changed)
Removed:
packages/cooker/x11-server-xgl/current/SOURCES/xgl-20060714.tar.bz2
packages/cooker/x11-server-xgl/current/SOURCES/xgl-XkbGetKeyboard.patch
packages/cooker/x11-server-xgl/current/SOURCES/xgl-arrayobj.patch
packages/cooker/x11-server-xgl/current/SOURCES/xgl-bitset.patch
packages/cooker/x11-server-xgl/current/SOURCES/xgl-rbadaptors.patch
packages/cooker/x11-server-xgl/current/SOURCES/xgl-xinerama.patch
Modified:
packages/cooker/x11-server-xgl/current/SPECS/x11-server-xgl.spec
Log:
update snapshot (20070105) for new Mesa (and drop merged patches)
Added: packages/cooker/x11-server-xgl/current/SOURCES/xgl-20070105.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/x11-server-xgl/current/SPECS/x11-server-xgl.spec
==============================================================================
--- packages/cooker/x11-server-xgl/current/SPECS/x11-server-xgl.spec
(original)
+++ packages/cooker/x11-server-xgl/current/SPECS/x11-server-xgl.spec Tue Feb
13 21:59:42 2007
@@ -1,8 +1,8 @@
%define shortname xgl
%define name x11-server-xgl
%define version 0.0.1
-%define rel 10
-%define git 20060714
+%define rel 1
+%define git 20070105
%if %{git}
%define release %mkrel 0.%{git}.%{rel}
@@ -29,17 +29,6 @@
Url: http://www.freedesktop.org/wiki/Software/Xgl
Source0: %{srcpath}
Source1: Xgl.defaults
-# revert "Mesa CVS head" patches
-# http://lists.freedesktop.org/archives/xorg/2006-April/014688.html
-Patch0: xgl-bitset.patch
-# http://lists.freedesktop.org/archives/xorg/2006-May/015526.html
-Patch1: xgl-rbadaptors.patch
-Patch2: xgl-xinerama.patch
-# http://lists.freedesktop.org/archives/xorg-commit/2006-June/007764.html
-Patch3: xgl-arrayobj.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=7137
-# patch adapted from opensuse
-Patch4: xgl-XkbGetKeyboard.patch
Patch5: 0004-Blue-background-on-startup.txt
BuildRoot: %{_tmppath}/%{name}-build-root
@@ -86,11 +75,6 @@
%prep
%setup -q -n %{distname}
-%patch0 -R -p0 -b .bitset
-%patch1 -p1 -b .rbadaptors
-%patch2 -b .xinerama
-%patch3 -R -p1 -b .arrayobj
-%patch4 -p0 -b .xkb
%patch5 -p1 -b .blue_bg
%build
@@ -114,7 +98,7 @@
%makeinstall_std
# (blino) would conflict with x11-server-xorg
-rm -f %{buildroot}%{xgldir}/man/man1/Xserver.1*
+rm -f %{buildroot}%{xgldir}/share/man/man1/Xserver.1*
# (blino) would conflict with x11-server-devel
rm -f %{buildroot}%{xgldir}/%{_lib}/pkgconfig/xorg-server.pc
rm -f %{buildroot}%{xgldir}/share/aclocal/xorg-server.m4
