- R:fontconfig-devel for devel package

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index be51ec9797838d5e5ff910f2bc1300d1f0a00af1..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:       0.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
@@ -109,7 +109,7 @@ Patch40:    XFree86-Xfont-Type1-large-DoS.patch
 # "strip -g libGLcore.a" leaves empty objects m_debug_*.o, which cause
 # warnings during GLcore loading ("m_debug_*.o: no symbols") - shut up them
 Patch41:       XFree86-GLcore-strip-a-workaround.patch
-Patch42:       XFree86-disable_glide.patch
+Patch42:       %{name}-disable_glide.patch
 Patch43:       XFree86-expat.patch
 Patch44:       XFree86-pkgconfig.patch
 # spencode.o in libspeedo.a is empty - patch like for libGLcore.a
@@ -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
@@ -133,6 +135,7 @@ BuildRequires:      bison
 BuildRequires: ed
 BuildRequires: expat-devel
 BuildRequires: flex
+BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
@@ -145,14 +148,14 @@ BuildRequires:    zlib-devel
 Requires:      %{name}-libs = %{epoch}:%{version}
 Requires:      xauth
 Requires:      pam >= 0.77.3
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:      XFree86 = %{epoch}:%{version}-%{release}
 Obsoletes:     xpm-progs
 Obsoletes:     xterm
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1
 %endif
-Provides:      XFree86 = %{epoch}:%{version}-%{release}
+ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
@@ -304,8 +307,8 @@ Summary(pl):        Display PostScript
 Group:         X11/Xorg
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      DPS
-Obsoletes:     dgs
 Provides:      XFree86-DPS = %{epoch}:%{version}-%{release}
+Obsoletes:     dgs
 
 %description DPS
 X-Window Display PostScript is device-independent imaging model for
@@ -321,8 +324,8 @@ Summary(pl):        Pliki nag
 Group:         X11/Xorg
 Requires:      %{name}-DPS = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-Obsoletes:     dgs-devel
 Provides:      XFree86-DPS-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     dgs-devel
 
 %description DPS-devel
 Header files for develop X-Window Display Postscript.
@@ -335,8 +338,8 @@ Summary:    Display PostScript static libraries
 Summary(pl):   Biblioteki statyczne Display PostScript
 Group:         X11/Xorg
 Requires:      %{name}-DPS-devel = %{epoch}:%{version}-%{release}
-Obsoletes:     dgs-static
 Provides:      XFree86-DPS-static = %{epoch}:%{version}-%{release}
+Obsoletes:     dgs-static
 
 %description DPS-static
 X-Window Display PostScript static libraries.
@@ -363,8 +366,8 @@ Summary:    OpenGL support for X11R6 - GL library
 Summary(pl):   Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
 Group:         XFree86/Libraries
 Requires:      X11-OpenGL-core = %{epoch}:%{version}-%{release}
-Obsoletes:     X11-driver-firegl
 Provides:      XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
+Obsoletes:     X11-driver-firegl
 
 %description OpenGL-libGL
 OpenGL support for X11R6 system - GL library.
@@ -380,9 +383,9 @@ Requires:   %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Requires:      OpenGL-devel-base
 Provides:      OpenGL-devel
+Provides:      XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     Mesa-devel
 Obsoletes:     glxMesa-devel
-Provides:      XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
 
 %description OpenGL-devel
 Headers and man pages for OpenGL for X11R6.
@@ -412,8 +415,8 @@ Group:              XFree86/Libraries
 Requires:      %{name}-OpenGL-core
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      OpenGL
-Obsoletes:     Mesa
 Provides:      XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     Mesa
 
 %description OpenGL-libs
 OpenGL libraries for X11R6 system.
@@ -427,8 +430,8 @@ Summary(pl):        Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
 Group:         X11/Development/Libraries
 Requires:      %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
 Provides:      OpenGL-static
-Obsoletes:     Mesa-static
 Provides:      XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
+Obsoletes:     Mesa-static
 
 %description OpenGL-static
 X11R6 static libraries with OpenGL.
@@ -510,6 +513,7 @@ Requires:   /usr/X11R6/lib/X11/rgb.txt
 Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
 Requires:      X11-fonts-base
 Requires:      pam
+Provides:      XFree86-Xserver = %{epoch}:%{version}-%{release}
 Obsoletes:     X11-Mono
 Obsoletes:     X11-SVGA
 Obsoletes:     X11-VGA16
@@ -520,7 +524,6 @@ Obsoletes:  X11-Sun24
 #Obsoletes:    X11-Mach8 X11-8514 X11-AGX X11-P9000
 # (and many drivers from XF86_SVGA server... and some from others)
 Obsoletes:     Xconfigurator
-Provides:      XFree86-Xserver = %{epoch}:%{version}-%{release}
 
 %description Xserver
 Generally used X server which uses display hardware. It requires
@@ -644,12 +647,21 @@ 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
-Obsoletes:     xpm-devel
+Provides:      xrender-devel = 0.8.4
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1-devel
 %endif
-Provides:      XFree86-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     render
+Obsoletes:     xcursor-devel
+Obsoletes:     xft-devel
+Obsoletes:     xpm-devel
+Obsoletes:     xrender-devel
 
 %description devel
 Libraries, header files, and documentation for developing programs
@@ -1277,12 +1289,18 @@ Requires(post,postun):  /sbin/ldconfig
 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
-Obsoletes:     xpm
+Provides:      xrender
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1-libs
 %endif
-Provides:      XFree86-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     xcursor
+Obsoletes:     xft
+Obsoletes:     xpm
+Obsoletes:     xrender
 
 %description libs
 X11-libs contains the shared libraries that most X programs need to
@@ -1369,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.
@@ -1410,11 +1429,14 @@ Summary(ru):    
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Provides:      XFree86-static = %{epoch}:%{version}-%{release}
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1-devel
 %endif
+Obsoletes:     xcursor-static
+Obsoletes:     xft-static
 Obsoletes:     xpm-static
-Provides:      XFree86-static = %{epoch}:%{version}-%{release}
+Obsoletes:     xrender-static
 
 %description static
 X11R6 static libraries.
@@ -1440,8 +1462,8 @@ Group:            X11/Xorg
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      man-config
-Obsoletes:     X11R6-contrib
 Provides:      XFree86-tools = %{epoch}:%{version}-%{release}
+Obsoletes:     X11R6-contrib
 
 %description tools
 Various tools for X, including listres, xbiff, xedit, xeyes, xcalc,
@@ -1506,8 +1528,7 @@ Xconfigurator, X11-xfs 
 Summary:       Cursors Theme "handhelds"
 Summary(pl):   Motyw kursorów "handhelds"
 Group:         X11/Themes
-Requires:      X11-libs
-Requires:      xcursor
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 
 %description -n XcursorTheme-handhelds
 Cursors theme "handhelds" for X11.
@@ -1519,8 +1540,7 @@ Motyw kursor
 Summary:       Cursors theme "redglass"
 Summary(pl):   Motyw kursorów "redglass"
 Group:         X11/Themes
-Requires:      X11-libs
-Requires:      xcursor
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 
 %description -n XcursorTheme-redglass
 Cursors theme "redglass" for X11.
@@ -1532,8 +1552,7 @@ Motyw kursor
 Summary:       Cursors theme "whiteglass"
 Summary(pl):   Motyw kursorów "whiteglass"
 Group:         X11/Themes
-Requires:      X11-libs
-Requires:      xcursor
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 
 %description -n XcursorTheme-whiteglass
 Cursors theme "whiteglass" for X11.
@@ -1590,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
@@ -1645,8 +1665,8 @@ Requires: pam >= 0.71
 Requires:      sessreg = %{epoch}:%{version}-%{release}
 Requires:      /usr/X11R6/bin/sessreg
 Provides:      XDM
-Obsoletes:     gdm
 Provides:      xdm = %{epoch}:%{version}-%{release}
+Obsoletes:     gdm
 
 %description xdm
 Xdm manages a collection of X displays, which may be on the local host
@@ -1681,8 +1701,8 @@ Requires(postun): /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      X11-fonts-base
-Obsoletes:     xfsft
 Provides:      xfs = %{epoch}:%{version}-%{release}
+Obsoletes:     xfsft
 
 %description xfs
 This is a font server for XOrg X11. You can serve fonts to other X
@@ -1716,8 +1736,6 @@ X11-xfs ͦ
 ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
 X11-libs.
 
-#--- %prep ---------------------------
-
 %prep
 %setup -qc -a1 -a2 -a7
 %patch0 -p0
@@ -1770,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}" \
@@ -1820,10 +1841,10 @@ 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 X11 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
+ln -sf %{_bindir}/Xorg $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
 
 # add X11 links in /usr/bin, /usr/lib /usr/include
 ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11
@@ -1918,21 +1939,6 @@ gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
 gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
 %endif
 
-# kill some stuff for cleaner build
-# (packaged separately, DRM already in kernel)
-rm -rf $RPM_BUILD_ROOT%{_pkgconfigdir}/{xcursor,xft}.pc \
-       $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontconfig.pc \
-       $RPM_BUILD_ROOT%{_mandir}/{man3/fontconfig.3x,man1/fc-{cache,list}.1x} \
-       $RPM_BUILD_ROOT%{_libdir}/{libfontconfig.*,libXrender.*,libXcursor.*,libXft.{a,so.2*}} \
-       $RPM_BUILD_ROOT%{_includedir}/{fontconfig,X11/{Xcursor,Xft}} \
-       $RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list,xcursor-config,xft-config} \
-       $RPM_BUILD_ROOT/etc/fonts \
-       $RPM_BUILD_ROOT%{_prefix}/src
-
-# skipped from removal - %%exclude is used for these
-# %{_includedir}/X11/extensions/{Xrender.h,render.h,renderproto.h}
-# %{_mandir}/man3/Xft.3x
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2386,6 +2392,13 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/bdftopcf
+%ifnarch ppc sparc sparc64 sparcv9
+%attr(755,root,root) %{_bindir}/ioport
+%endif
+%attr(755,root,root) %{_bindir}/mmapr
+%attr(755,root,root) %{_bindir}/mmapw
+%attr(755,root,root) %{_bindir}/xcursor-config
+%attr(755,root,root) %{_bindir}/xft-config
 %attr(755,root,root) %{_libdir}/libFS.so
 %attr(755,root,root) %{_libdir}/libI810XvMC.so
 %attr(755,root,root) %{_libdir}/libICE.so
@@ -2394,9 +2407,11 @@ fi
 %attr(755,root,root) %{_libdir}/libXRes.so
 %attr(755,root,root) %{_libdir}/libXTrap.so
 %attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXcursor.so
 %attr(755,root,root) %{_libdir}/libXext.so
 %attr(755,root,root) %{_libdir}/libXfont.so
 %attr(755,root,root) %{_libdir}/libXfontcache.so
+%attr(755,root,root) %{_libdir}/libXft.so
 %attr(755,root,root) %{_libdir}/libXi.so
 %attr(755,root,root) %{_libdir}/libXinerama.so
 %attr(755,root,root) %{_libdir}/libXmu.so
@@ -2404,6 +2419,7 @@ fi
 %attr(755,root,root) %{_libdir}/libXp.so
 %attr(755,root,root) %{_libdir}/libXpm.so
 %attr(755,root,root) %{_libdir}/libXrandr.so
+%attr(755,root,root) %{_libdir}/libXrender.so
 %attr(755,root,root) %{_libdir}/libXss.so
 %attr(755,root,root) %{_libdir}/libXt.so
 %attr(755,root,root) %{_libdir}/libXtst.so
@@ -2427,19 +2443,17 @@ fi
 %{_includedir}/X11/PM
 %{_includedir}/X11/SM
 %{_includedir}/X11/Xaw
+%{_includedir}/X11/Xcursor
+%{_includedir}/X11/Xft
 %{_includedir}/X11/Xmu
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/*.h
 %{_includedir}/X11/fonts
 %{_includedir}/xf86*.h
 %{_libx11dir}/config
-
-%exclude %{_includedir}/X11/extensions/Xrender.h
-%exclude %{_includedir}/X11/extensions/render.h
-%exclude %{_includedir}/X11/extensions/renderproto.h
-
 %{_mandir}/man3/[A-FH-Z]*
-%exclude %{_mandir}/man3/Xft.3*
+%{_pkgconfigdir}/xcursor.pc
+%{_pkgconfigdir}/xft.pc
 
 %files Xserver-devel
 %defattr(644,root,root,755)
@@ -2796,9 +2810,11 @@ fi
 %attr(755,root,root) %{_libdir}/libXRes.so.*.*
 %attr(755,root,root) %{_libdir}/libXTrap.so.*.*
 %attr(755,root,root) %{_libdir}/libXaw.so.*.*
+%attr(755,root,root) %{_libdir}/libXcursor.*.*.*
 %attr(755,root,root) %{_libdir}/libXext.so.*.*
 %attr(755,root,root) %{_libdir}/libXfont.so.*.*
 %attr(755,root,root) %{_libdir}/libXfontcache.so.*.*
+%attr(755,root,root) %{_libdir}/libXft.so.*.*
 %attr(755,root,root) %{_libdir}/libXi.so.*.*
 %attr(755,root,root) %{_libdir}/libXinerama.so.*.*
 %attr(755,root,root) %{_libdir}/libXmu.so.*.*
@@ -2806,6 +2822,7 @@ fi
 %attr(755,root,root) %{_libdir}/libXp.so.*.*
 %attr(755,root,root) %{_libdir}/libXpm.so.*.*
 %attr(755,root,root) %{_libdir}/libXrandr.so.*.*
+%attr(755,root,root) %{_libdir}/libXrender.so.*.*.*
 %attr(755,root,root) %{_libdir}/libXss.so.*.*
 %attr(755,root,root) %{_libdir}/libXt.so.*.*
 %attr(755,root,root) %{_libdir}/libXtst.so.*.*
@@ -2905,9 +2922,11 @@ fi
 %{_libdir}/libXRes.a
 %{_libdir}/libXTrap.a
 %{_libdir}/libXaw.a
+%{_libdir}/libXcursor.a
 %{_libdir}/libXext.a
 %{_libdir}/libXfont.a
 %{_libdir}/libXfontcache.a
+%{_libdir}/libXft.a
 %{_libdir}/libXi.a
 %{_libdir}/libXinerama.a
 %{_libdir}/libXmu.a
@@ -2915,6 +2934,7 @@ fi
 %{_libdir}/libXp.a
 %{_libdir}/libXpm.a
 %{_libdir}/libXrandr.a
+%{_libdir}/libXrender.a
 %{_libdir}/libXss.a
 %{_libdir}/libXt.a
 %{_libdir}/libXtst.a