- added x32 arch libdirs

[packages/FHS.git] / FHS.spec

diff --git a/FHS.spec b/FHS.spec
index e50c65bbe5851df07c31ada9955d33ca4ef36fa6..8beb0e3d9ab8b2e09931ec09b157bdedeffd637d 100644 (file)
--- a/FHS.spec
+++ b/FHS.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      Podstawowy układ katalogów systemu Linux zgodny z FHS 2.3
 Summary(tr.UTF-8):     Temel dosya sistemi yapısı
 Name:          FHS
 Version:       2.3
-Release:       31
+Release:       36
 License:       GPL
 Group:         Base
 URL:           http://www.pathname.com/fhs/
@@ -72,7 +72,7 @@ install -d \
        $RPM_BUILD_ROOT/{bin,boot,dev,etc,home,opt,srv} \
        $RPM_BUILD_ROOT/etc/{X11,opt} \
        $RPM_BUILD_ROOT/lib/modules \
-       $RPM_BUILD_ROOT/{mnt,media/{cdrom,floppy},proc,root/tmp,sbin,tmp} \
+       $RPM_BUILD_ROOT/{mnt,media,proc,root/tmp,sbin,tmp} \
        $RPM_BUILD_ROOT/usr/{bin,games,include,lib,sbin,share,src} \
        $RPM_BUILD_ROOT/usr/share/{dict,doc,games,info,misc,tmac,xml} \
        $RPM_BUILD_ROOT/usr/lib/games \
@@ -81,6 +81,13 @@ install -d \
 
 %if "%{_lib}" == "lib64"
 install -d $RPM_BUILD_ROOT{/lib64,/usr/lib64/games,/usr/local/lib64}
+%ifarch %{x8664}
+install -d $RPM_BUILD_ROOT{/libx32,/usr/libx32/games,/usr/local/libx32}
+%endif
+%endif
+
+%if "%{_lib}" == "libx32"
+install -d $RPM_BUILD_ROOT{/libx32,/usr/libx32/games,/usr/local/libx32}
 %endif
 
 install -d $RPM_BUILD_ROOT/usr/share/man/man{1,2,3,4,5,6,7,8}
@@ -134,9 +141,7 @@ posix.chown("/var/lock", 0, %{gid_uucp})
 %dir /home
 %dir /lib
 %dir /lib/modules
-%dir %attr(775,root,root) /media
-%dir %attr(775,root,root) %verify(not group) /media/floppy
-%dir %attr(775,root,root) %verify(not group) /media/cdrom
+%dir /media
 %dir /mnt
 %dir /opt
 %dir %attr(555,root,root) %verify(not group) /proc
@@ -197,4 +202,16 @@ posix.chown("/var/lock", 0, %{gid_uucp})
 %dir /usr/lib64
 %dir /usr/lib64/games
 %dir /usr/local/lib64
+%ifarch %{x8664}
+%dir /libx32
+%dir /usr/libx32
+%dir /usr/libx32/games
+%dir /usr/local/libx32
+%endif
+%endif
+%if "%{_lib}" == "libx32"
+%dir /libx32
+%dir /usr/libx32
+%dir /usr/libx32/games
+%dir /usr/local/libx32
 %endif