- require xorg-font-font-misc-misc-base, which contains fixed font

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

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 206ee2bc46114e070cc2302d0c0255d043de9bf6..4fc3732ea0dbfb6b765d3c989978e3a4140f664c 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -2,16 +2,18 @@ Summary:      X.org server
 Summary(pl):   Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.0.1
-Release:       0.1
+Release:       0.6
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-%{version}.tar.bz2
 # Source0-md5: aa0ccb851ec5f7f9b132581d9a5827e4
-Source1:       http://dl.sourceforge.net/mesa3d/MesaLib-6.4.1.tar.bz2
-# Source1-md5: ea148c828ec6f645526451db1b8556f1
+Source1:       http://dl.sourceforge.net/mesa3d/MesaLib-6.4.2.tar.bz2
+# Source1-md5: 7674d2c603b5834259e4e5a820cefd5b
 Source2:       xserver.pamd
 Patch0:                %{name}-ncurses.patch
 Patch1:                %{name}-symlinks.patch
+Patch2:                %{name}-xwrapper.patch
+Patch3:                %{name}-compositefastpath.patch
 URL:           http://xorg.freedesktop.org/
 # for glx headers
 BuildRequires: Mesa-libGL-devel
@@ -21,6 +23,7 @@ BuildRequires:        cpp
 BuildRequires: libdrm-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
+BuildRequires: pam-devel
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: xorg-lib-libX11-devel
@@ -75,6 +78,10 @@ Requires:    xorg-app-xkbcomp
 # just for %{_includedir}/bitmaps dir
 Requires:      xorg-data-xbitmaps
 Requires:      xorg-data-xkbdata
+# xserver requires default fixed and cursosr fonts.
+Requires:      xorg-font-font-alias
+Requires:      xorg-font-font-cursor-misc
+Requires:      xorg-font-font-misc-misc-base
 # for new app-defaults location
 Requires:      xorg-lib-libXt >= 1.0.0
 Obsoletes:     X11-Xserver
@@ -199,6 +206,8 @@ Pliki nag
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
+%patch3 -p0
 
 %build
 %{__libtoolize}
@@ -208,10 +217,11 @@ Pliki nag
 %{__automake}
 %configure \
        --enable-dga \
+       --enable-builddocs \
        --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.1"
+       --with-mesa-source="`pwd`/Mesa-6.4.2"
 
 %{__make}
 
@@ -236,6 +246,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING ChangeLog
 %attr(755,root,root) %{_bindir}/X
 %attr(755,root,root) %{_bindir}/Xorg
+%attr(4755,root,root) %{_bindir}/Xwrapper
 %attr(755,root,root) %{_bindir}/getconfig
 %attr(755,root,root) %{_bindir}/getconfig.pl
 %attr(755,root,root) %{_bindir}/gtf