- don't build fonts

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index de0590eb81700909540f1239da873c08c7d06465..20e73ffa1a90d005495363235b26249dca2e1a41 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:       3
+Release:       5
 Epoch:         1
 License:       XFree86 1.0 (?)
 Group:         X11/Xorg
@@ -124,9 +124,6 @@ Patch54:    %{name}-setxkbmap.patch
 Patch55:       %{name}-makefile-fastbuild.patch
 URL:           http://www.x.org/
 BuildRequires: /usr/bin/perl
-#%ifarch %{ix86} alpha amd64 ia64
-#%{?with_tdfx:BuildRequires:   Glide3-DRI-devel}
-#%endif
 # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
 %ifarch %{ix86} amd64 ia64
 %{?with_glide:BuildRequires:   Glide2x_SDK}
@@ -145,7 +142,7 @@ BuildRequires:      rpmbuild(macros) >= 1.143
 BuildRequires: tcl-devel
 BuildRequires: utempter-devel
 BuildRequires: zlib-devel
-Requires:      %{name}-libs = %{epoch}:%{version}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      xauth
 Requires:      pam >= 0.77.3
 Provides:      XFree86 = %{epoch}:%{version}-%{release}
@@ -160,6 +157,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 %define                _soundsdir      /usr/share/sounds
+%define                _wallpapersdir  /usr/share/wallpapers
 %define                _themesdir      /usr/share/themes
 %define                _wmpropsdir     /usr/share/wm-properties
 %define                _xsessdir       /usr/share/xsessions
@@ -569,6 +567,7 @@ Summary(pl):        Serwer XOrg X11 Xvfb
 Summary(ru):   óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
 Summary(uk):   óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
 Group:         X11/Xorg/Servers
+Provides:      XFree86-Xvfb = %{epoch}:%{version}-%{release}
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      /usr/X11R6/lib/X11/rgb.txt
 Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
@@ -1817,7 +1816,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
        $RPM_BUILD_ROOT/var/{log,lib/xkb} \
        $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
        $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
-       $RPM_BUILD_ROOT%{_xsessdir} \
+       $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir}} \
        $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} -C xc        install install.man \
@@ -2274,10 +2273,10 @@ fi
 %attr(755,root,root) %{_libdir}/libdps.so.*.*
 %attr(755,root,root) %{_libdir}/libdpstk.so.*.*
 %attr(755,root,root) %{_libdir}/libpsres.so.*.*
-%{_mandir}/man1/makepsres*
-%{_mandir}/man1/pswrap*
-%{_mandir}/man1/dpsexec*
-%{_mandir}/man1/dpsinfo*
+%{_mandir}/man1/makepsres.1*
+%{_mandir}/man1/pswrap.1*
+%{_mandir}/man1/dpsexec.1*
+%{_mandir}/man1/dpsinfo.1*
 
 %files DPS-devel
 %defattr(644,root,root,755)
@@ -2345,7 +2344,7 @@ fi
 # Linux OpenGL ABI compatibility symlink
 %attr(755,root,root) /usr/%{_lib}/libGLU.so.1
 %{_mandir}/man1/glxinfo.1*
-%{_mandir}/man1/glxgears.1x*
+%{_mandir}/man1/glxgears.1*
 
 %files OpenGL-static
 %defattr(644,root,root,755)
@@ -2464,7 +2463,7 @@ fi
 %files driver-apm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
-%{_mandir}/man4/apm*
+%{_mandir}/man4/apm.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2479,7 +2478,7 @@ fi
 %files driver-chips
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
-%{_mandir}/man4/chips*
+%{_mandir}/man4/chips.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2487,14 +2486,14 @@ fi
 %files driver-cirrus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
-%{_mandir}/man4/cirrus*
+%{_mandir}/man4/cirrus.4*
 %endif
 
 %ifarch %{ix86} ia64 amd64
 %files driver-cyrix
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
-%{_mandir}/man4/cyrix*
+%{_mandir}/man4/cyrix.4*
 %endif
 
 %ifarch %{ix86} ia64 amd64 sparc sparc64 mips ppc arm superh
@@ -2509,7 +2508,7 @@ fi
 %files driver-glide
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{_mandir}/man4/glide.4*
 %endif
 %endif
 
@@ -2519,14 +2518,14 @@ fi
 %ifarch %{ix86} ia64 amd64 alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
 %endif
-%{_mandir}/man4/glint*
+%{_mandir}/man4/glint.4*
 
 # Devel: sparc sparc64
 %ifarch %{ix86} ia64 amd64
 %files driver-i128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
-%{_mandir}/man4/i128*
+%{_mandir}/man4/i128.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2534,7 +2533,7 @@ fi
 %files driver-i740
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
-%{_mandir}/man4/i740*
+%{_mandir}/man4/i740.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2545,7 +2544,7 @@ fi
 # i810_dri alone is built on amd64 - what for?
 %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
-%{_mandir}/man4/i810*
+%{_mandir}/man4/i810.4*
 %endif
 
 # Devel: %{ix86} sparc sparc64 ppc amd64
@@ -2563,7 +2562,7 @@ fi
 %ifarch %{ix86} ia64 amd64 alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
 %endif
-%{_mandir}/man4/mga*
+%{_mandir}/man4/mga.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2571,7 +2570,7 @@ fi
 %files driver-neomagic
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
-%{_mandir}/man4/neomagic*
+%{_mandir}/man4/neomagic.4*
 %endif
 
 # Devel: %{ix86} sparc sparc64 amd64
@@ -2595,7 +2594,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
 %attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
-%{_mandir}/man4/nv*
+%{_mandir}/man4/nv.4*
 %endif
 
 %files driver-ati
@@ -2608,7 +2607,7 @@ fi
 %ifarch %{ix86} ia64 amd64 alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
 %endif
-%{_mandir}/man4/r128*
+%{_mandir}/man4/r128.4*
 
 %files driver-radeon
 %defattr(644,root,root,755)
@@ -2617,7 +2616,7 @@ fi
 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
 %endif
-%{_mandir}/man4/radeon*
+%{_mandir}/man4/radeon.4*
 
 # Devel: sparc sparc64
 %ifarch %{ix86} ia64 amd64 alpha
@@ -2625,7 +2624,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
 %{_libdir}/modules/*.uc
-%{_mandir}/man4/rendition*
+%{_mandir}/man4/rendition.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2633,7 +2632,7 @@ fi
 %files driver-s3virge
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
-%{_mandir}/man4/s3virge*
+%{_mandir}/man4/s3virge.4*
 %endif
 
 %ifarch %{ix86} ia64 amd64 mips alpha ppc arm
@@ -2648,7 +2647,7 @@ fi
 %files driver-savage
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
-%{_mandir}/man4/savage*
+%{_mandir}/man4/savage.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2656,7 +2655,7 @@ fi
 %files driver-siliconmotion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
-%{_mandir}/man4/siliconmotion*
+%{_mandir}/man4/siliconmotion.4*
 %endif
 
 %ifarch %{ix86} ia64 amd64 mips ppc arm
@@ -2666,35 +2665,35 @@ fi
 %ifarch %{ix86} ia64
 %attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
 %endif
-%{_mandir}/man4/sis*
+%{_mandir}/man4/sis.4*
 %endif
 
 %ifarch sparc sparc64
 %files driver-sunbw2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
-%{_mandir}/man4/sunbw2*
+%{_mandir}/man4/sunbw2.4*
 %endif
 
 %ifarch sparc sparc64
 %files driver-suncg14
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
-%{_mandir}/man4/suncg14*
+%{_mandir}/man4/suncg14.4*
 %endif
 
 %ifarch sparc sparc64
 %files driver-suncg3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
-%{_mandir}/man4/suncg3*
+%{_mandir}/man4/suncg3.4*
 %endif
 
 %ifarch sparc sparc64
 %files driver-suncg6
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
-%{_mandir}/man4/suncg6*
+%{_mandir}/man4/suncg6.4*
 %endif
 
 %ifarch sparc sparc64
@@ -2703,21 +2702,21 @@ fi
 %attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
 # Devel: %{ix86} ia64 (for fun?)
 %attr(755,root,root) %{_libdir}/modules/dri/ffb_dri.so
-%{_mandir}/man4/sunffb*
+%{_mandir}/man4/sunffb.4*
 %endif
 
 %ifarch sparc sparc64
 %files driver-sunleo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
-%{_mandir}/man4/sunleo*
+%{_mandir}/man4/sunleo.4*
 %endif
 
 %ifarch sparc sparc64
 %files driver-suntcx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
-%{_mandir}/man4/suntcx*
+%{_mandir}/man4/suntcx.4*
 %endif
 
 %ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha arm ppc
@@ -2742,14 +2741,14 @@ fi
 %files driver-trident
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
-%{_mandir}/man4/trident*
+%{_mandir}/man4/trident.4*
 %endif
 
 %ifarch %{ix86} ia64 amd64
 %files driver-tseng
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
-%{_mandir}/man4/tseng*
+%{_mandir}/man4/tseng.4*
 %endif
 
 %ifarch %{ix86} ia64
@@ -2764,7 +2763,7 @@ fi
 %files driver-vmware
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
-%{_mandir}/man4/vmware*
+%{_mandir}/man4/vmware.4*
 %endif
 
 %files libs
@@ -2790,7 +2789,12 @@ fi
 %lang(sk) %dir %{_appdefsdir}/sk
 %lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312
 %lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5
-%{_libx11dir}/locale
+%dir %{_libx11dir}/locale
+%{_libx11dir}/locale/[!l]*
+%{_libx11dir}/locale/locale.*
+%dir %{_libx11dir}/locale/%{_lib}
+%dir %{_libx11dir}/locale/%{_lib}/common
+%attr(755,root,root) %{_libx11dir}/locale/%{_lib}/common/*.so*
 %dir %{_includedir}
 %dir %{_includedir}/X11
 /usr/include/X11
@@ -2800,6 +2804,7 @@ fi
 %dir %{_pixmapsdir}
 %dir %{_pixmapsdir}/mini
 %dir %{_soundsdir}
+%dir %{_wallpapersdir}
 %dir %{_wmpropsdir}
 %dir %{_xsessdir}
 %attr(755,root,root) %{_libdir}/libFS.so.*.*