SPECS: X11.spec - moved dirs to filesystem; rel 17

[glen]

Author: glen                         Date: Tue Oct 31 00:04:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved dirs to filesystem; rel 17

---- Files affected:
SPECS:
   X11.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.208 SPECS/X11.spec:1.209
--- SPECS/X11.spec:1.208	Sun Sep 24 15:37:54 2006
+++ SPECS/X11.spec	Tue Oct 31 01:04:16 2006
@@ -28,7 +28,7 @@
 Summary(zh_CN):	XOrg X11 ´°żÚϾͳˇţÎńĆ÷şÍťůąžłĚĐň
 Name:		X11
 Version:	6.9.0
-Release:	16
+Release:	17
 Epoch:		1
 License:	MIT/X Consortium/BSD (see README)
 Group:		X11
@@ -162,6 +162,7 @@
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xauth = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.79.0
+Requires:	filesystem >= 2.0-1
 Provides:	XFree86 = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86
 Obsoletes:	xpm-progs
@@ -176,12 +177,9 @@
 
 %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
-%define		_wmstylesdir	/etc/sysconfig/wmstyle
 %define		_libx11dir	%{_prefix}/lib/X11
 %define		_appdefsdir	%{_libx11dir}/app-defaults
 
@@ -1907,6 +1905,7 @@
 Summary(uk):	đŇĎÓÔÉĘ ×ŚËĎÎÎÉĘ ÍĹÎĹÄÖĹŇ
 Group:		X11/Window Managers
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	filesystem >= 2.0-1
 Provides:	twm = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-twm
 Obsoletes:	twm
@@ -2131,7 +2130,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
 	$RPM_BUILD_ROOT%{_appdefsdir}/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
 	$RPM_BUILD_ROOT%{_datadir}/misc \
@@ -2139,8 +2138,8 @@
 	$RPM_BUILD_ROOT/usr/{bin,include,lib} \
 	$RPM_BUILD_ROOT/var/{log,lib/xkb} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
-	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial}} \
-	$RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
+	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_themesdir}/{ThinIce,Metal,Industrial}} \
+	$RPM_BUILD_ROOT%{_xsessdir} \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}
 
 PWD=`pwd`
@@ -2382,7 +2381,6 @@
 %attr(755,root,root) %{_libx11dir}/xinit
 %attr(755,root,root) %{_libx11dir}/xsm
 
-%dir /etc/X11/xinit
 %dir /etc/X11/lbxproxy
 /etc/X11/lbxproxy/*
 %dir /etc/X11/proxymngr
@@ -3153,9 +3151,6 @@
 %files libs
 %defattr(644,root,root,755)
 /etc/ld.so.conf.d/*.conf
-%dir %{_sysconfdir}/xdg
-%dir %{_themesdir}
-%dir %{_themesdir}/Default
 %dir %{_themesdir}/ThinIce
 %dir %{_themesdir}/Metal
 %dir %{_themesdir}/Industrial
@@ -3189,14 +3184,7 @@
 /usr/include/X11
 %dir %{_sbindir}
 %dir %{_datadir}/misc
-%dir %{_iconsdir}
-%dir %{_pixmapsdir}
 %dir %{_pixmapsdir}/mini
-%dir %{_soundsdir}
-%dir %{_wallpapersdir}
-%dir %{_wmpropsdir}
-%dir %{_xsessdir}
-%dir %{_wmstylesdir}
 %attr(755,root,root) %{_libdir}/libFS.so.*.*
 %attr(755,root,root) %{_libdir}/lib*XvMC*.so.*.*
 %attr(755,root,root) %{_libdir}/libICE.so.*.*
@@ -3580,6 +3568,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2006/10/31 00:04:16  glen
+- moved dirs to filesystem; rel 17
+
 Revision 1.208  2006/09/24 13:37:54  orzech
 - applied patch for i945GM posted by Leszek Zdonek
 - rel.16, builds and works fine, STBR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.208&r2=1.209&f=u