From b453e3369f0230295f9165f54dc55ea6160032fa Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 22:18:26 +0100
Subject: [PATCH] own lib and lib64 dirs and symlinks [release 2.3-9mamba;Mon
 Sep 04 2023]

---
 filesystem.spec | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/filesystem.spec b/filesystem.spec
index 0c6b69f..4e8ff93 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:          filesystem
 Version:       2.3
-Release:       8mamba
+Release:       9mamba
 Summary:       The basic directory layout for a Linux system
 Group:         System/Configuration
 Vendor:        openmamba
@@ -24,11 +24,14 @@ Filesystem contains the basic directory layout for a Linux operating system, inc
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
-install -d %{buildroot}/{boot,dev,etc/opt,home,%_lib,mnt,proc}
+install -d %{buildroot}/{boot,dev,etc/opt,home,mnt,proc}
 install -d %{buildroot}/{root,tmp,usr/local,var,opt,initrd}
 
 for dirname in %{buildroot}/usr %{buildroot}/usr/local; do
    install -d $dirname/{bin,etc,include,%_lib,share,src}
+%if "%_lib" != "lib"
+   install -d $dirname/lib
+%endif
 #  ln -s share/{man,doc,info} $dirname
    install -d $dirname/share/{dict,doc,info,locale,man,empty}
    install -d $dirname/share/{nls,misc,terminfo,zoneinfo}
@@ -53,6 +56,14 @@ install -d %{buildroot}/sys
 # Owning /bin and /sbin symlinks 
 ln -s usr/bin %{buildroot}/bin
 ln -s usr/sbin %{buildroot}/sbin
+ln -s bin %{buildroot}/usr/sbin
+
+# Owning /lib and /lib64 symlinks 
+ln -s usr/lib %{buildroot}/lib
+%if "%_lib" != "lib"
+ln -s usr/%_lib %{buildroot}/%_lib
+%endif
+
 #ln -s bin %{buildroot}/usr/sbin
 #ln -s bin %{buildroot}/usr/local/sbin
 ln -s ../var/tmp %{buildroot}/usr
@@ -196,7 +207,10 @@ fi
 %dir /etc
 %dir /etc/opt
 %dir /home
-%dir /%_lib
+/%_lib
+%if "%_lib" != "lib"
+/lib
+%endif
 %dir /media
 %dir /mnt
 %dir /proc
@@ -211,8 +225,11 @@ fi
 %dir /usr/bin
 %dir /usr/etc
 %dir /usr/include
-%dir /usr/%_lib
-#/usr/sbin
+%dir /usr/lib
+%if "%_lib" != "lib"
+%dir /usr/lib64
+%endif
+/usr/sbin
 %dir /usr/src
 %dir /usr/share
 %dir /usr/share/dict
@@ -232,7 +249,10 @@ fi
 %dir /usr/local/etc
 %dir /usr/local/games
 %dir /usr/local/include
-%dir /usr/local/%_lib
+%dir /usr/local/lib
+%if "%_lib" != "lib"
+%dir /usr/local/lib64
+%endif
 %dir /usr/local/man
 #/usr/local/sbin
 %dir /usr/local/share
@@ -275,6 +295,9 @@ fi
 /usr/tmp
 
 %changelog
+* Mon Sep 04 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.3-9mamba
+- own lib and lib64 dirs and symlinks
+
 * Sat Sep 02 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.3-8mamba
 - posttrans: ensure /lib and /lib64 symlinks exist or create