From 9cce50b55ff72d2cb8a35bcf75e6345046225e58 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Thu, 16 Apr 2026 19:18:46 +0200
Subject: [PATCH] - Move lib to top dir and remove usr, - Update mk_base_image
 to use urpmi-setup-dump.cgi, - Now support rx3-base 1.1.2.

---
 ReleaseNotes.txt                       | 10 ++++++++++
 SPECS/docker_tools.spec                |  8 ++++++--
 {usr/lib => lib}/rx3/docker_tools.bash |  0
 sbin/mk_base_image                     |  6 +++---
 4 files changed, 19 insertions(+), 5 deletions(-)
 rename {usr/lib => lib}/rx3/docker_tools.bash (100%)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 2697a56..487357e 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,13 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/04/xx
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move lib to top dir and remove usr,
+- Update mk_base_image to use urpmi-setup-dump.cgi,
+- Now support rx3-base 1.1.2.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/Docker Tools V 1.5.1 - A. GIBERT - 2026/04/10
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/SPECS/docker_tools.spec b/SPECS/docker_tools.spec
index fd34c83..cdb4802 100644
--- a/SPECS/docker_tools.spec
+++ b/SPECS/docker_tools.spec
@@ -24,7 +24,7 @@
 
 
 %define name                            docker_tools
-%define version                         1.5.1
+%define version                         1.5.2
 %define release                         %mkrel 1rx3
 
 %global debug_package                   %{nil}
@@ -116,7 +116,7 @@ cp etc/bash_completion.d/*              %{buildroot}%{_sysconfdir}/bash_completi
 
 # Lib
 %{__mkdir_p}                            %{buildroot}%{_prefix}/lib/rx3
-cp usr/lib/rx3/*.bash                   %{buildroot}%{_prefix}/lib/rx3
+cp lib/rx3/*.bash                       %{buildroot}%{_prefix}/lib/rx3
 
 # Bin
 %{__mkdir_p}                            %{buildroot}%{_sbindir}
@@ -174,6 +174,10 @@ cp sbin/*                               %{buildroot}%{_sbindir}
 #-----------------------------------------------------------------------------------------------------------------------------------
 
 %changelog
+* Thu Apr 16 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
+- Update to 1.5.2
+- move lib to top dir
+
 * Fri Apr 10 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.1-1rx3.mga9
 - Update to 1.5.1
 
diff --git a/usr/lib/rx3/docker_tools.bash b/lib/rx3/docker_tools.bash
similarity index 100%
rename from usr/lib/rx3/docker_tools.bash
rename to lib/rx3/docker_tools.bash
diff --git a/sbin/mk_base_image b/sbin/mk_base_image
index 17c6e3d..a8a2bac 100755
--- a/sbin/mk_base_image
+++ b/sbin/mk_base_image
@@ -116,7 +116,8 @@ function mbi_args_parse()
     # Note the quotes around `$tmp_args': they are essential!
     eval set -- "${tmp_args}"
 
-    while true ; do
+    while true
+    do
 	case "$1" in
             
 	    # Options
@@ -246,7 +247,7 @@ function mbi_env_init()
             echo_error "Making Builder..."
 
             cmd_exec                         cp /etc/resolv.conf "${BUILDER_DIR}/etc/resolv.conf"
-            cmd_exec chroot "${BUILDER_DIR}" bash -c 'curl -L http://mirror.rx3.net/rx3/sbin/urpmi-setup-'${DISTRIB}' | bash'
+            cmd_exec chroot "${BUILDER_DIR}" bash -c 'curl -L http://mirror.rx3.net/rx3/cgi-bin/urpmi-setup-dump.cgi?'${DISTRIB}' | bash'
             cmd_exec chroot "${BUILDER_DIR}" urpmi --force rx3-base
         fi
     fi
@@ -350,7 +351,6 @@ function mbi_base_install_post()
 {
     
     cmd_exec chroot ${ROOT_DIR} urpmi-setup --verbose --distrib "${DISTRIB}"
-#    cmd_exec chroot ${ROOT_DIR} bash -c 'curl -L http://mirror.rx3.net/rx3/sbin/urpmi-setup-'${DISTRIB}' | bash'
     
     cmd_exec chroot ${ROOT_DIR} urpmi --force --auto-update