- filesystem with common directories

[packages/FHS.git] / FHS.spec

diff --git a/FHS.spec b/FHS.spec
index 21c636ecd41fb2468d69c525ea173bf37301dada..f4e6e0f071847289e22b0bc2518c40b857c95872 100644 (file)
--- a/FHS.spec
+++ b/FHS.spec
@@ -5,17 +5,15 @@ Summary(pl):  Podstawowy uk
 Summary(tr):   Temel dosya sistemi yapýsý
 Name:          FHS
 Version:       2.3
-Release:       8
+Release:       14.2
 License:       GPL
 Group:         Base
 URL:           http://www.pathname.com/fhs/
-PreReq:                setup >= 2.4.6-4
-Provides:      filesystem
-Obsoletes:     filesystem
+BuildRequires: rpmbuild(macros) >= 1.213
+Requires:      setup >= 2.4.6-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _locmandir      /usr/local/man
-%define                _xmandir        /usr/X11R6/man
 # directory for "privilege separation" chroot
 %define                _privsepdir     /usr/share/empty
 # directory for *.idl files (for CORBA implementations)
@@ -51,38 +49,37 @@ ayr
 rm -rf $RPM_BUILD_ROOT
 
 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,/%{_lib}/security} \
+       $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%{_prefix}/{bin,games,include/security,lib/cgi-bin,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,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} \
+       $RPM_BUILD_ROOT%{_fontsdir}/{100,75}dpi \
+       $RPM_BUILD_ROOT%{_fontsdir}/OTF \
+       $RPM_BUILD_ROOT%{_fontsdir}/Speedo \
        $RPM_BUILD_ROOT%{_fontsdir}/Type1/{afm,pfm} \
        $RPM_BUILD_ROOT%{_fontsdir}/TTF \
+       $RPM_BUILD_ROOT%{_fontsdir}/cyrillic \
+       $RPM_BUILD_ROOT%{_fontsdir}/local \
        $RPM_BUILD_ROOT%{_fontsdir}/misc \
-       $RPM_BUILD_ROOT%{_privsepdir} \
-       $RPM_BUILD_ROOT/usr/X11R6/share
+       $RPM_BUILD_ROOT%{_privsepdir}
 
-%ifarch amd64 ppc64 sparc64
+%ifarch %{x8664} ppc64 s390x 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 sr sv zh_CN zh_TW ; do
+                   pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW ; do
                install -d $RPM_BUILD_ROOT%{_mandir}/${mloc}/${manp}
        done
-       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
@@ -115,6 +112,7 @@ fi
 /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
@@ -175,11 +173,13 @@ fi
 %lang(sk) %{_mandir}/sk
 %lang(sr) %{_mandir}/sr
 %lang(sv) %{_mandir}/sv
+%lang(tr) %{_mandir}/tr
+%lang(uk) %{_mandir}/uk
 %lang(zh_CN) %{_mandir}/zh_CN
 %lang(zh_TW) %{_mandir}/zh_TW
 %{_datadir}/misc
 %{_datadir}/tmac
-%dir %{_libdir}/cgi-bin
+%dir %{_prefix}/lib/cgi-bin
 %{_prefix}/src
 %dir %{_prefix}/local
 %{_prefix}/local/bin
@@ -194,14 +194,6 @@ fi
 %{_prefix}/local/share/info
 %{_locmandir}
 %{_prefix}/local/src
-%dir /usr/X11R6
-%dir %{_xmandir}
-%{_xmandir}/man*
-%lang(it) %{_xmandir}/it
-%lang(ko) %{_xmandir}/ko
-%lang(pl) %{_xmandir}/pl
-%dir /usr/X11R6/share
-
 %dir /var
 /var/cache
 %dir /var/crash