- R:fontconfig-devel for devel package

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index 81feb61df96fbdf23867d7475a5e48cb55e58220..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:       1
+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,8 +647,13 @@ 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
+Provides:      xft-devel = 2.1.6
 Provides:      xpm-devel
+Provides:      xrender-devel = 0.8.4
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1-devel
 %endif
@@ -1283,7 +1290,10 @@ Requires(post,postun):   grep
 Requires(postun):      fileutils
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Provides:      XFree86-libs = %{epoch}:%{version}-%{release}
+Provides:      xcursor
+Provides:      xft
 Provides:      xpm
+Provides:      xrender
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1-libs
 %endif
@@ -1377,6 +1387,7 @@ X11-libs ͦ
 Summary:       Modules with X servers extensions
 Summary(pl):   Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
 Group:         X11/Xorg
+Provides:      XFree86-modules = %{epoch}:%{version}-%{release}
 
 %description modules
 Modules with X servers extensions.
@@ -1598,6 +1609,7 @@ Summary(pl):      Twm - podstawowy zarz
 Summary(ru):   ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
 Summary(uk):   ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
 Group:         X11/Window Managers
+Provides:      twm
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 
 %description twm
@@ -1724,8 +1736,6 @@ X11-xfs ͦ
 ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
 X11-libs.
 
-#--- %prep ---------------------------
-
 %prep
 %setup -qc -a1 -a2 -a7
 %patch0 -p0
@@ -1778,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}" \
@@ -1828,7 +1841,7 @@ fi
 
 # setting default X
 rm -f $RPM_BUILD_ROOT%{_bindir}/X
-ln -sf X11 $RPM_BUILD_ROOT%{_bindir}/X
+ln -sf Xorg $RPM_BUILD_ROOT%{_bindir}/X
 
 # setting ghost X in /etc/X11 -- xf86config will fix this ...
 ln -sf %{_bindir}/Xorg $RPM_BUILD_ROOT%{_sysconfdir}/X11/X