- don't build fonts

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index 281817348416c2088bd0ceae6f153389c2bb6ca0..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:       4
+Release:       5
 Epoch:         1
 License:       XFree86 1.0 (?)
 Group:         X11/Xorg
@@ -157,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
@@ -566,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}
@@ -1814,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 \
@@ -2787,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
@@ -2797,6 +2804,7 @@ fi
 %dir %{_pixmapsdir}
 %dir %{_pixmapsdir}/mini
 %dir %{_soundsdir}
+%dir %{_wallpapersdir}
 %dir %{_wmpropsdir}
 %dir %{_xsessdir}
 %attr(755,root,root) %{_libdir}/libFS.so.*.*