X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=FHS.spec;h=08ea409748974fc7622eb500f010590954264ef0;hb=28ef5f0bd770e68c90874e27287b29ca23ff58c9;hp=70acab242885450eb5141ce3b835105acd56554f;hpb=05bf41ba0cf6ce5352852b5768285db292edab20;p=packages%2FFHS.git

diff --git a/FHS.spec b/FHS.spec
index 70acab2..08ea409 100644
--- a/FHS.spec
+++ b/FHS.spec
@@ -1,15 +1,15 @@
-Summary:	Basic FHS 2.2 filesystem layout
+Summary:	Basic FHS 2.3 filesystem layout
 Summary(de):	Grundlegende Dateisystemstruktur
 Summary(fr):	Arborescence de base du système de fichiers
-Summary(pl):	Podstawowy uk³ad katalogów systemu Linux zgodny z FHS 2.2
+Summary(pl):	Podstawowy uk³ad katalogów systemu Linux zgodny z FHS 2.3
 Summary(tr):	Temel dosya sistemi yapýsý
 Name:		FHS
-Version:	2.2
-Release:	17
+Version:	2.3
+Release:	8
 License:	GPL
 Group:		Base
 URL:		http://www.pathname.com/fhs/
-PreReq:		setup
+PreReq:		setup >= 2.4.6-4
 Provides:	filesystem
 Obsoletes:	filesystem
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -24,22 +24,22 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 This package contains the basic directory layout for a Linux system,
 including the proper permissions for the directories. This layout
-conforms to the Filesystem Hierarchy Standard (FHS) 2.2.
+conforms to the Filesystem Hierarchy Standard (FHS) 2.3.
 
 %description -l de
 Dieses Paket enthält die grundlegende Verzeichnisstruktur eines
 Linux-Systems, einschließlich der entsprechenden Zugriffsrechte. Diese
-Struktur entspricht dem Filesystem Hierarchy Standard (FHS) 2.2.
+Struktur entspricht dem Filesystem Hierarchy Standard (FHS) 2.3.
 
 %description -l fr
 Ce package contient l'arborescence type pour système Linux y compris
 les permissions adéquates pour les répertoires. Cette arborescence est
-conforme au standard \"Filesystem Hierarchy Standard\" (FHS) 2.2.
+conforme au standard "Filesystem Hierarchy Standard" (FHS) 2.3.
 
 %description -l pl
 Pakiet ten zawiera informacje o podstawowej strukturze katalogów
 systemu i praw dostêpu do nich. Struktura katalogów jest zgodna z FHS
-2.2.
+2.3.
 
 %description -l tr
 Bu paket GNU makro iþleme dilini içerir. Mantýksal olarak
@@ -50,13 +50,14 @@ ayr
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{bin,boot,dev,etc,home/{users,services},opt,sys,selinux} \
+install -d $RPM_BUILD_ROOT/{bin,boot,initrd,dev,etc,home/{users,services},opt,selinux,srv,sys} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{X11,opt,security} \
-	$RPM_BUILD_ROOT/lib/{modules,security} \
-	$RPM_BUILD_ROOT/{mnt/{cdrom,floppy},proc,root,sbin,tmp} \
+	$RPM_BUILD_ROOT{/lib/modules,/%{_lib}/security} \
+	$RPM_BUILD_ROOT/{mnt,media/{cdrom,floppy},proc,root,sbin,tmp} \
 	$RPM_BUILD_ROOT%{_prefix}/{bin,games,include/security,lib,sbin,share,src/examples} \
 	$RPM_BUILD_ROOT%{_datadir}/{applications,dict,doc,games,info,misc,tmac} \
 	$RPM_BUILD_ROOT%{_libdir}/games \
+	$RPM_BUILD_ROOT%{_libdir}/cgi-bin \
 	$RPM_BUILD_ROOT%{_prefix}/local/{bin,games,include,lib,sbin,share/{doc,info},src} \
 	$RPM_BUILD_ROOT/var/{lock/subsys,log,mail,run,spool} \
 	$RPM_BUILD_ROOT/var/{cache,crash,db,games,lib/misc,local,opt,tmp} \
@@ -67,18 +68,19 @@ install -d $RPM_BUILD_ROOT/{bin,boot,dev,etc,home/{users,services},opt,sys,selin
 	$RPM_BUILD_ROOT%{_privsepdir} \
 	$RPM_BUILD_ROOT/usr/X11R6/share
 
-%ifarch ppc64 sparc64 x86_64
+%ifarch amd64 ppc64 sparc64
 install -d $RPM_BUILD_ROOT{/lib64,%{_prefix}/lib64,%{_prefix}/local/lib64}
 %endif
 
-for manp in man{1,2,3,4,5,6,7,8,9} ; do
+for manp in man{1,2,3,4,5,6,7,8} ; do
 	install -d $RPM_BUILD_ROOT%{_mandir}/${manp}
 	install -d $RPM_BUILD_ROOT%{_locmandir}/${manp}
 	install -d $RPM_BUILD_ROOT%{_xmandir}/${manp}
-	for mloc in bg cs da de el es fi fr gl hr hu id it ja ko nl pl pt pt_BR ro ru sl sk sv ; do
+	for mloc in bg cs da de el es fi fr gl hr hu id it ja ko nl pl pt \
+		    pt_BR ro ru sl sk sr sv zh_CN zh_TW ; do
 		install -d $RPM_BUILD_ROOT%{_mandir}/${mloc}/${manp}
 	done
-	for mloc in da fi fr hu it ja ko pl sk ; do
+	for mloc in it ko pl ; do
 		install -d $RPM_BUILD_ROOT%{_xmandir}/${mloc}/${manp}
 	done
 done
@@ -107,6 +109,7 @@ fi
 %dir /
 /bin
 /boot
+/initrd
 /dev
 %dir /etc
 %dir %{_sysconfdir}/X11
@@ -114,8 +117,11 @@ fi
 %attr(751,root,root) %dir /etc/security
 %dir /home
 /home/users
-%attr(751,root,root) /home/services
+%attr(751,root,adm) /home/services
 /lib
+%attr(775,root,disk) %dir /media
+%attr(775,root,disk) /media/floppy
+%attr(775,root,disk) /media/cdrom
 /mnt
 /opt
 %attr(555,root,proc) %verify(not group) /proc
@@ -123,6 +129,7 @@ fi
 %dir /sbin
 %dir /sys
 %dir /selinux
+%attr(751,root,root) /srv
 %attr(1777,root,root) /tmp
 %dir %{_prefix}
 %{_prefix}/bin
@@ -164,9 +171,13 @@ fi
 %lang(ru) %{_mandir}/ru
 %lang(sl) %{_mandir}/sl
 %lang(sk) %{_mandir}/sk
+%lang(sr) %{_mandir}/sr
 %lang(sv) %{_mandir}/sv
+%lang(zh_CN) %{_mandir}/zh_CN
+%lang(zh_TW) %{_mandir}/zh_TW
 %{_datadir}/misc
 %{_datadir}/tmac
+%dir %{_libdir}/cgi-bin
 %{_prefix}/src
 %dir %{_prefix}/local
 %{_prefix}/local/bin
@@ -182,15 +193,9 @@ fi
 %dir /usr/X11R6
 %dir %{_xmandir}
 %{_xmandir}/man*
-%lang(da) %{_xmandir}/da
-%lang(fi) %{_xmandir}/fi
-%lang(fr) %{_xmandir}/fr
-%lang(hu) %{_xmandir}/hu
 %lang(it) %{_xmandir}/it
-%lang(ja) %{_xmandir}/ja
 %lang(ko) %{_xmandir}/ko
 %lang(pl) %{_xmandir}/pl
-%lang(sk) %{_xmandir}/sk
 %dir /usr/X11R6/share
 
 %dir /var