- precompute lib* conditions to avoid code duplication

[packages/FHS.git] / FHS.spec

diff --git a/FHS.spec b/FHS.spec
index 8a7a83905b3862ab005b9d6ba442fb36319b0dd0..b75fe0a6e5b39366b578946500012677aeb02cda 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:       32
+Release:       36
 License:       GPL
 Group:         Base
 URL:           http://www.pathname.com/fhs/
@@ -22,6 +22,20 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # nothing to put there
 %define                _enable_debug_packages  0
 
+%if "%{_lib}" == "lib64"
+%define                with_lib64      1
+%else
+%define                with_lib64      0
+%endif
+%if "%{_lib}" == "libx32"
+%define                with_libx32     1
+%else
+%ifarch %{x8664}
+# x32 as additional ABI
+%define                with_libx32     1
+%endif
+%endif
+
 # avoid rpm 4.4.9 adding rm -rf buildroot, we need the dirs to check consistency
 %define                __spec_clean_body       %{nil}
 
@@ -72,16 +86,19 @@ 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 \
        $RPM_BUILD_ROOT/usr/local/{bin,etc,games,include,lib,sbin,share/{doc,info},src} \
        $RPM_BUILD_ROOT/var/{cache,crash,db,games,lib/misc,local,lock,log,mail,opt,run,spool,tmp,yp}
 
-%if "%{_lib}" == "lib64"
+%if %{with lib64}
 install -d $RPM_BUILD_ROOT{/lib64,/usr/lib64/games,/usr/local/lib64}
 %endif
+%if %{with 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}
 install -d $RPM_BUILD_ROOT%{_locmandir}/man{1,2,3,4,5,6,7,8}
@@ -134,9 +151,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
@@ -192,9 +207,15 @@ posix.chown("/var/lock", 0, %{gid_uucp})
 %dir /var/spool
 %dir /var/yp
 %dir %attr(1777,root,root) /var/tmp
-%if "%{_lib}" == "lib64"
+%if %{with lib64}
 %dir /lib64
 %dir /usr/lib64
 %dir /usr/lib64/games
 %dir /usr/local/lib64
 %endif
+%if %{with libx32}
+%dir /libx32
+%dir /usr/libx32
+%dir /usr/libx32/games
+%dir /usr/local/libx32
+%endif