- changed location for cgi programs:

[packages/FHS.git] / FHS.spec

diff --git a/FHS.spec b/FHS.spec
index 21c636ecd41fb2468d69c525ea173bf37301dada..358f00a68a1f36fc63dd3da334931adc56b764ff 100644 (file)
--- a/FHS.spec
+++ b/FHS.spec
@@ -5,10 +5,11 @@ Summary(pl):  Podstawowy uk
 Summary(tr):   Temel dosya sistemi yapýsý
 Name:          FHS
 Version:       2.3
-Release:       8
+Release:       12
 License:       GPL
 Group:         Base
 URL:           http://www.pathname.com/fhs/
+BuildRequires: rpmbuild(macros) >= 1.213
 PreReq:                setup >= 2.4.6-4
 Provides:      filesystem
 Obsoletes:     filesystem
@@ -51,13 +52,12 @@ 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} \
@@ -68,7 +68,7 @@ install -d $RPM_BUILD_ROOT/{bin,boot,initrd,dev,etc,home/{users,services},opt,se
        $RPM_BUILD_ROOT%{_privsepdir} \
        $RPM_BUILD_ROOT/usr/X11R6/share
 
-%ifarch amd64 ppc64 sparc64
+%ifarch %{x8664} ppc64 s390x sparc64
 install -d $RPM_BUILD_ROOT{/lib64,%{_prefix}/lib64,%{_prefix}/local/lib64}
 %endif
 
@@ -77,7 +77,7 @@ for manp in man{1,2,3,4,5,6,7,8} ; do
        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 sl sk sr sv uk zh_CN zh_TW ; do
                install -d $RPM_BUILD_ROOT%{_mandir}/${mloc}/${manp}
        done
        for mloc in it ko pl ; do
@@ -115,6 +115,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 +176,12 @@ fi
 %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
+%dir %{_prefix}/lib/cgi-bin
 %{_prefix}/src
 %dir %{_prefix}/local
 %{_prefix}/local/bin