diff --git a/filesystem.spec b/filesystem.spec index e7901c4..76aebe9 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -2,7 +2,7 @@ Name: filesystem Version: 2.3 -Release: 10mamba +Release: 12mamba Summary: The basic directory layout for a Linux system Group: System/Configuration Vendor: openmamba @@ -117,9 +117,9 @@ end done } # /usr/sbin -> /usr/bin merge -[ -e /usr/sbin.rpmmoved ] && { - echo "Migrating /usr/sbin to /usr/bin..." - for d in /usr/sbin /usr/local/sbin; do +for d in /usr/sbin /usr/local/sbin; do + [ -e $d.rpmmoved ] && { + echo "Migrating $d.rpmmoved to ${d/sbin/bin}..." for f in $d.rpmmoved/*; do dest="${d/sbin/bin}/`basename $f`" if [ -e "$dest" ]; then @@ -154,8 +154,8 @@ end done /usr/bin/rmdir $d.rpmmoved || /usr/bin/mv $d.rpmmoved $d.notmigrated /usr/bin/ln -s bin $d - done -} + } +done : %post @@ -324,6 +324,12 @@ fi /usr/tmp %changelog +* Fri Oct 20 2023 Silvan Calarco 2.3-12mamba +- fix not checking for /usr/local/sbin.rpmmoved causing displaying errors + +* Sun Sep 24 2023 Silvan Calarco 2.3-11mamba +- bump release to retrigger a /usr/sbin migration check + * Tue Sep 05 2023 Silvan Calarco 2.3-10mamba - attempt to solve /usr/sbin upgrade error when owning directory to symlink