- sorted Rs

[packages/xorg-xserver-server.git] / xorg-xserver-server.spec

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 31c29e0307ea6bcd3da7cccc49885aac12bc32f0..b8c0c2ef3086980de03a1a37103c5bce91309be2 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -10,7 +10,7 @@ Summary:      X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.4
-Release:       2
+Release:       3
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -24,6 +24,7 @@ Patch1:               %{name}-xwrapper.patch
 # nasty hack for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
 Patch2:                %{name}-gcc-x86_64-workaround.patch
 Patch3:                %{name}-link.patch
+Patch4:                %{name}-dbus.patch
 URL:           http://xorg.freedesktop.org/
 # for glx headers
 BuildRequires: OpenGL-GLX-devel
@@ -91,9 +92,10 @@ BuildRequires:       xorg-proto-xf86vidmodeproto-devel
 BuildRequires: xorg-proto-xineramaproto-devel
 BuildRequires: xorg-proto-xproto-devel >= 7.0.9
 BuildRequires: xorg-util-util-macros >= 0.99.2
-# xcalibrateproto, tslib (for KDRIVE only)
+#BR: xcalibrateproto, tslib (for KDRIVE only)
+#BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
+Requires:      pixman >= 0.9.5
 Requires:      xkeyboard-config
-# glitz-devel >= 0.4.3 (for XGL and EGL only)
 # for rgb.txt
 Requires:      xorg-app-rgb >= 0.99.3
 Requires:      xorg-app-xkbcomp
@@ -284,6 +286,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch2 -p1
 %endif
 %patch3 -p1
+%patch4 -p0
 
 # 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