- R:fontconfig-devel for devel package

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index e57c027fc847749995d202f98fc2acf8f23b40f7..29c741363b74050057e49b99f893f86387cb3575 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -19,7 +19,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.7.0
-Release:       2
+Release:       3
 Epoch:         1
 License:       XFree86 1.0 (?)
 Group:         X11/Xorg
@@ -67,7 +67,7 @@ Source50:     xcalc.png
 Source51:      xload.png
 Source52:      xmag.png
 Source53:      http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: bf9b05a66798796b53ed1a050049b2ee
+# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf
 Patch0:                %{name}-PLD.patch
 Patch1:                XFree86-HasZlib.patch
 Patch2:                XFree86-DisableDebug.patch
@@ -120,6 +120,8 @@ Patch47:    XFree86-sparc-kbd.patch
 Patch50:       %{name}-xterm-256colors.patch
 Patch52:       XFree86-kernel_headers.patch
 Patch53:       XFree86-stdint.patch
+Patch54:       %{name}-setxkbmap.patch
+Patch55:       %{name}-makefile-fastbuild.patch
 URL:           http://www.x.org/
 BuildRequires: /usr/bin/perl
 %ifarch %{ix86} alpha amd64
@@ -645,6 +647,7 @@ Summary(uk):        
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      imake = %{epoch}:%{version}-%{release}
+Requires:      fontconfig-devel >= 1:2.2.0
 Provides:      XFree86-devel = %{epoch}:%{version}-%{release}
 Provides:      render
 Provides:      xcursor-devel
@@ -1733,8 +1736,6 @@ X11-xfs ͦ
 ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
 X11-libs.
 
-#--- %prep ---------------------------
-
 %prep
 %setup -qc -a1 -a2 -a7
 %patch0 -p0
@@ -1787,11 +1788,14 @@ X11-libs.
 %patch50 -p0
 %patch52 -p1
 %patch53 -p0
+%patch54 -p1
+%patch55 -p0
 
 rm -f xc/config/cf/host.def
 
 %build
 %{__make} -S -C xc World \
+       FAST=1 \
        DEFAULT_OS_CPU_FROB=%{_target_cpu} \
        CC="%{__cc}" \
        BOOTSTRAPCFLAGS="%{rpmcflags}" \