X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=FHS.spec;h=a33f1f909ca6492782dcac6cd2d1cf8ad3ce7d9e;hb=8265d7d155d2a927b175a1015bc1ca792f4ffc6c;hp=94204654866605c30e283648e642d5f9db58b837;hpb=5359a4a532876069c55a7af107e57c58c8033c14;p=packages%2FFHS.git

diff --git a/FHS.spec b/FHS.spec
index 9420465..a33f1f9 100644
--- a/FHS.spec
+++ b/FHS.spec
@@ -1,21 +1,18 @@
-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:	10
+Version:	2.3
+Release:	11
 License:	GPL
 Group:		Base
 URL:		http://www.pathname.com/fhs/
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-BuildRequires:	grep
-BuildRequires:	textutils
-PreReq:		setup
-BuildArch:	noarch
+PreReq:		setup >= 2.4.6-4
 Provides:	filesystem
 Obsoletes:	filesystem
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_locmandir	/usr/local/man
 %define		_xmandir	/usr/X11R6/man
@@ -27,22 +24,22 @@ Obsoletes:	filesystem
 %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
@@ -53,14 +50,15 @@ ayr
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{bin,boot,dev,etc,home/{users,services},opt,sys} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{X11,opt,security} \
-	$RPM_BUILD_ROOT/lib/{modules,security} \
-	$RPM_BUILD_ROOT/{mnt/{cdrom,floppy},proc,root,sbin,tmp} \
+install -d $RPM_BUILD_ROOT/{bin,boot,initrd,dev,etc,home/{users,services},opt,selinux,srv,sys} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{X11,certs,opt,security} \
+	$RPM_BUILD_ROOT{/lib/{firmware,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}/{dict,doc,games,info,misc,tmac} \
+	$RPM_BUILD_ROOT%{_datadir}/{applications,dict,doc,games,info,misc,tmac} \
 	$RPM_BUILD_ROOT%{_libdir}/games \
-	$RPM_BUILD_ROOT%{_prefix}/local/{bin,games,include,lib,sbin,share/{doc,info},src} \
+	$RPM_BUILD_ROOT%{_libdir}/cgi-bin \
+	$RPM_BUILD_ROOT%{_prefix}/local/{bin,etc,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} \
 	$RPM_BUILD_ROOT%{_idldir} \
@@ -70,26 +68,33 @@ install -d $RPM_BUILD_ROOT/{bin,boot,dev,etc,home/{users,services},opt,sys} \
 	$RPM_BUILD_ROOT%{_privsepdir} \
 	$RPM_BUILD_ROOT/usr/X11R6/share
 
+%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} ; 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 uk 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
 install -d $RPM_BUILD_ROOT%{_mandir}/man{n,l}
 install -d $RPM_BUILD_ROOT%{_mandir}/pl/mann
 
+ln -sf ../man $RPM_BUILD_ROOT/usr/local/share/man
+
 %clean
 cd $RPM_BUILD_ROOT
 
 # %{_rpmfilename} is not expanded, so use
 # %{name}-%{version}-%{release}.%{buildarch}.rpm
-RPMFILE=%{name}-%{version}-%{release}.%{buildarch}.rpm
+RPMFILE=%{name}-%{version}-%{release}.%{_target_cpu}.rpm
 TMPFILE=%{name}-%{version}.tmp$$
 find . | sed -e 's|^\.||g' -e 's|^$||g' | sort | grep -v $TMPFILE > $TMPFILE
 
@@ -106,21 +111,28 @@ fi
 %dir /
 /bin
 /boot
+/initrd
 /dev
 %dir /etc
 %dir %{_sysconfdir}/X11
+%attr(751,root,root) %dir /etc/certs
 %dir %{_sysconfdir}/opt
 %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
 %attr(700,root,root) /root
 %dir /sbin
 %dir /sys
+%dir /selinux
+%attr(751,root,root) /srv
 %attr(1777,root,root) /tmp
 %dir %{_prefix}
 %{_prefix}/bin
@@ -129,6 +141,7 @@ fi
 %{_prefix}/lib
 %{_prefix}/sbin
 %dir %{_prefix}/share
+%{_datadir}/applications
 %{_datadir}/dict
 %{_datadir}/doc
 %{_privsepdir}
@@ -161,33 +174,34 @@ fi
 %lang(ru) %{_mandir}/ru
 %lang(sl) %{_mandir}/sl
 %lang(sk) %{_mandir}/sk
+%lang(sr) %{_mandir}/sr
 %lang(sv) %{_mandir}/sv
+%lang(uk) %{_mandir}/uk
+%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
+%{_prefix}/local/etc
 %{_prefix}/local/games
 %{_prefix}/local/include
 %{_prefix}/local/lib
 %{_prefix}/local/sbin
 %dir %{_prefix}/local/share
 %{_prefix}/local/share/doc
+%{_prefix}/local/share/man
 %{_prefix}/local/share/info
 %{_locmandir}
 %{_prefix}/local/src
 %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
@@ -201,8 +215,14 @@ fi
 %attr(1771,root,uucp) %dir /var/lock
 %attr(700,root,root) %dir /var/lock/subsys
 %attr(751,root,root) /var/log
-%attr(775,root,mail) /var/mail
+%attr(2775,root,mail) /var/mail
 %dir /var/opt
 %dir /var/run
 %dir /var/spool
 %attr(1777,root,root) %dir /var/tmp
+
+%ifarch ppc64 sparc64 x86_64
+/lib64
+%{_prefix}/lib64
+%{_prefix}/local/lib64
+%endif