# HG changeset patch
# User Stanislas Leduc <shann@slitaz.org>
# Date 1709490321 -3600
# Node ID 50a8a74fbda3ac36db9f0689e3ed284456c10da8
# Parent  c965782a38e052ab3bc5a8b5d85b06f6d96130a3
tazpkg: upgrade core pkgs first, fix miss fr translations

diff -r c965782a38e0 -r 50a8a74fbda3 tazpkg/receipt
--- a/tazpkg/receipt	Wed Feb 28 15:51:05 2024 +0000
+++ b/tazpkg/receipt	Sun Mar 03 19:25:21 2024 +0100
@@ -37,6 +37,13 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+        # Thanks Rantanplan, fix miss translate in tazpkg.fr.html
+        patch -p1 < $stuff/tazpkg-doc-fr.patch
+
+        # Patch for upgrade core system package first
+        patch -p1 < $stuff/upgrade-core-pkg.patch
+        rm modules/upgrade.orig
+
 	sed -i 's|\. receipt|. ./receipt|' */*
 	make && make DESTDIR=$DESTDIR VERSION=$VERSION install
 }
diff -r c965782a38e0 -r 50a8a74fbda3 tazpkg/stuff/tazpkg-doc-fr.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/tazpkg-doc-fr.patch	Sun Mar 03 19:25:21 2024 +0100
@@ -0,0 +1,24 @@
+--- a/doc/tazpkg.fr.html
++++ b/doc/tazpkg.fr.html
+@@ -283,8 +283,7 @@
+             denières actions de TazPkg</li>
+           <li><a href="#clean-cache">clean-cache</a>&nbsp;: efface tous
+             les paquets téléchargés dans le répertoire cache</li>
+-          <li><a href="#list-cache">list-cache</a>: list all packages downloaded
+-            in cache directory</li>
++          <li><a href="#list-cache">list-cache</a>: liste les paquets dans le répertoire cache</li>
+           <li><a href="#shell">shell</a>&nbsp;: lancer le shell
+             interactif de TazPkg</li>
+         </ul>
+@@ -447,8 +446,9 @@
+       </article>
+ 
+       <article id="list-cache"><h3>list-cache</h3>
+-        <p>List *.tazpkg packages downloaded to the cache. Displays a list of
+-          file names and their sizes, as well as the total amount and size.</p>
++        <p>Liste les paquets *.tazpkg téléchargés dans le cache. Affiche une liste
++          des noms de fichiers et leur taille, ainsi que le nombre de fichiers et la
++          taille totale de ceux-ci.</p>
+         <pre>
+ # tazpkg list-cache
+ </pre>
diff -r c965782a38e0 -r 50a8a74fbda3 tazpkg/stuff/upgrade-core-pkg.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpkg/stuff/upgrade-core-pkg.patch	Sun Mar 03 19:25:21 2024 +0100
@@ -0,0 +1,17 @@
+--- a/modules/upgrade
++++ b/modules/upgrade
+@@ -84,6 +84,14 @@
+ '{printf "%-24s %-11s %-10s %s\n", $1, $4, $2, $5}';;
+ esac
+ sed -i /^$/d "$UP_LIST"
++# Ensure core system package upgrade first
++# glibc / gcc-lib-base
++if [[ "$(grep -F 'gcc-lib-base' $UP_LIST)" != '' ]]; then
++	sed -i -e '/gcc-lib-base/d' -e '1i gcc-lib-base' $UP_LIST
++fi
++if [[ "$(grep -F 'glibc-base' $UP_LIST)" != '' ]]; then
++	sed -i -e '/glibc-base/d' -e '1i glibc-base' $UP_LIST
++fi
+ upnb=$(wc -l < "$UP_LIST")
+ pkgs=$(wc -l < "$PKGS_DB/installed.info")
+ time=$(($(date +%s) - $time))