wok rev 25677

tazpkg: upgrade core pkgs first, fix miss fr translations
author Stanislas Leduc <shann@slitaz.org>
date Sun Mar 03 19:25:21 2024 +0100 (8 months ago)
parents c965782a38e0
children 70fb2457b74f
files tazpkg/receipt tazpkg/stuff/tazpkg-doc-fr.patch tazpkg/stuff/upgrade-core-pkg.patch
line diff
     1.1 --- a/tazpkg/receipt	Wed Feb 28 15:51:05 2024 +0000
     1.2 +++ b/tazpkg/receipt	Sun Mar 03 19:25:21 2024 +0100
     1.3 @@ -37,6 +37,13 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +        # Thanks Rantanplan, fix miss translate in tazpkg.fr.html
     1.8 +        patch -p1 < $stuff/tazpkg-doc-fr.patch
     1.9 +
    1.10 +        # Patch for upgrade core system package first
    1.11 +        patch -p1 < $stuff/upgrade-core-pkg.patch
    1.12 +        rm modules/upgrade.orig
    1.13 +
    1.14  	sed -i 's|\. receipt|. ./receipt|' */*
    1.15  	make && make DESTDIR=$DESTDIR VERSION=$VERSION install
    1.16  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/tazpkg/stuff/tazpkg-doc-fr.patch	Sun Mar 03 19:25:21 2024 +0100
     2.3 @@ -0,0 +1,24 @@
     2.4 +--- a/doc/tazpkg.fr.html
     2.5 ++++ b/doc/tazpkg.fr.html
     2.6 +@@ -283,8 +283,7 @@
     2.7 +             denières actions de TazPkg</li>
     2.8 +           <li><a href="#clean-cache">clean-cache</a>&nbsp;: efface tous
     2.9 +             les paquets téléchargés dans le répertoire cache</li>
    2.10 +-          <li><a href="#list-cache">list-cache</a>: list all packages downloaded
    2.11 +-            in cache directory</li>
    2.12 ++          <li><a href="#list-cache">list-cache</a>: liste les paquets dans le répertoire cache</li>
    2.13 +           <li><a href="#shell">shell</a>&nbsp;: lancer le shell
    2.14 +             interactif de TazPkg</li>
    2.15 +         </ul>
    2.16 +@@ -447,8 +446,9 @@
    2.17 +       </article>
    2.18 + 
    2.19 +       <article id="list-cache"><h3>list-cache</h3>
    2.20 +-        <p>List *.tazpkg packages downloaded to the cache. Displays a list of
    2.21 +-          file names and their sizes, as well as the total amount and size.</p>
    2.22 ++        <p>Liste les paquets *.tazpkg téléchargés dans le cache. Affiche une liste
    2.23 ++          des noms de fichiers et leur taille, ainsi que le nombre de fichiers et la
    2.24 ++          taille totale de ceux-ci.</p>
    2.25 +         <pre>
    2.26 + # tazpkg list-cache
    2.27 + </pre>
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/tazpkg/stuff/upgrade-core-pkg.patch	Sun Mar 03 19:25:21 2024 +0100
     3.3 @@ -0,0 +1,17 @@
     3.4 +--- a/modules/upgrade
     3.5 ++++ b/modules/upgrade
     3.6 +@@ -84,6 +84,14 @@
     3.7 + '{printf "%-24s %-11s %-10s %s\n", $1, $4, $2, $5}';;
     3.8 + esac
     3.9 + sed -i /^$/d "$UP_LIST"
    3.10 ++# Ensure core system package upgrade first
    3.11 ++# glibc / gcc-lib-base
    3.12 ++if [[ "$(grep -F 'gcc-lib-base' $UP_LIST)" != '' ]]; then
    3.13 ++	sed -i -e '/gcc-lib-base/d' -e '1i gcc-lib-base' $UP_LIST
    3.14 ++fi
    3.15 ++if [[ "$(grep -F 'glibc-base' $UP_LIST)" != '' ]]; then
    3.16 ++	sed -i -e '/glibc-base/d' -e '1i glibc-base' $UP_LIST
    3.17 ++fi
    3.18 + upnb=$(wc -l < "$UP_LIST")
    3.19 + pkgs=$(wc -l < "$PKGS_DB/installed.info")
    3.20 + time=$(($(date +%s) - $time))