10 files changed, 19 insertions, 23 deletions
diff --git a/images/Makefile b/images/Makefile
index e97ab5d45..abbbbfb44 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.config
 
 VERSION=2.91
 PRODUCT=drakx-installer-images
-KERNELS=$(shell rpm -qf /lib/modules/4.*)
+KERNELS=$(shell rpm -qf /lib/modules/6.*)
 
 IMAGES_DEST = $(ROOTDEST)/install/images
 
diff --git a/perl-install/Makefile b/perl-install/Makefile
index ced9a8a3b..0fe946485 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -68,7 +68,7 @@ tar: clean
 	$(info $(PACKAGE)-$(PKGVERSION).tar.xz is ready)
 
 tag:
-	git tag $(VERSION)
+	git tag -a $(VERSION) -m "$(VERSION)"
 
 # rules to build a distributable rpm
 
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 6f45650de..9883c6e60 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=18.67
+VERSION:=18.68
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 63d87aacc..a611f9748 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,8 @@
+- Drop i586 bits
+
+Version 18.68 - 28 April 2024
+- Updated translations
+
 Version 18.67 - 5 January 2024
 
 - Updated translations
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 15201a057..9aff9306c 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -1420,14 +1420,6 @@ sub BIGMEM() {
     arch() !~ /x86_64/ && $> == 0 && dmi_detect_memory() > 4 * 1024;
 }
 
-sub is_i586() {
-    return 0 if arch() !~ /86/;
-    my $cpuinfo = cat_('/proc/cpuinfo');
-    $cpuinfo =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6 ||
-      $cpuinfo =~ /^model name\s*:\s*Transmeta.* TM5800/m || # mdvbz#37866
-      !has_cpu_flag('cmov') || !has_cpu_flag('pae');
-}
-
 sub is_arm_openrd_client() {
     to_bool(cat_('/proc/cpuinfo') =~ /OpenRD Client/);
 }
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index aea57f78d..273cd934b 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -28,7 +28,7 @@ tar:
 	$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
 
 tag:
-	git tag $(VERSION)
+	git tag -a $(VERSION) -m "$(VERSION)"
 
 install:
 	$(MAKE) full_stage2
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 702af331a..6f94d10fc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,9 @@
-- Adapt to rpm-4.19
+- Drop i586 bits
+
+Version 18.68 - 28 April 2024
+- Adapt to rpm-4.19.1
+- Fix debug build
+- Updated translations
 
 Version 18.67 - 5 January 2024
 
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index b095d8d41..a9692e225 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -160,8 +160,6 @@ sub _bestKernel_extensions {
     my ($o_match_all_hardware) = @_;
 
     $::o->{kernel_extension} ? $::o->{kernel_extension} :
-    $o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') :
-      detect_devices::is_i586() ? '-desktop586' :
       _is_kernelServer_needed() ? '-server' :
       '-desktop';
 }
@@ -174,7 +172,6 @@ sub bestKernelPackage {
 
     if (!@kernels) {
         #- fallback on most generic kernel if the suitable one is not available
-        #- (only kernel-desktop586-latest is available on Dual ISO for i586)
         my @fallback_exts = _bestKernel_extensions('force');
         @kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @fallback_exts;
     }
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 9c18a3ae9..e96400870 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -292,7 +292,7 @@
   </mode>
   /usr/share/libDrakX/pixmaps
   /usr/lib/rpm/rpmrc
-  /usr/lib/rpm/rpmpopt-4.19.0
+  /usr/lib/rpm/rpmpopt-4.19.1
   /usr/lib/rpm/mageia/macros
   /usr/lib/rpm/macros
   /usr/share/pci.ids
@@ -332,10 +332,9 @@
   <if set="DEBUG_INSTALL">
     /usr/libexec/gdb
     <from expand="glob">
-      /usr/include/python3.*/pyconfig.h
+      /usr/include/python3.*/pyconfig-*.h
       /usr/LIB/libpython3.*so
       /usr/LIB/python3.*/abc.py
-      /usr/LIB/python3.*/_bootlocale.py
       /usr/LIB/python3.*/codecs.py
       /usr/LIB/python3.*/_collections_abc.py
       /usr/LIB/python3.*/contextlib.py
@@ -352,7 +351,6 @@
       /usr/LIB/python3.*/functools.py
       /usr/LIB/python3.*/genericpath.py
       /usr/LIB/python3.*/heapq.py
-      /usr/LIB/python3.*/imp.py
       /usr/LIB/python3.*/io.py
       /usr/LIB/python3.*/keyword.py
       /usr/LIB/python3.*/linecache.py
@@ -360,7 +358,6 @@
       /usr/LIB/python3.*/os.py
       /usr/LIB/python3.*/posixpath.py
       /usr/LIB/python3.*/reprlib.py
-      /usr/LIB/python3.*/re.py
       /usr/LIB/python3.*/site.py
       /usr/LIB/python3.*/_sitebuiltins.py
       /usr/LIB/python3.*/sre_compile.py
diff --git a/perl-install/standalone/po/sv.po b/perl-install/standalone/po/sv.po
index fda360f01..5c3b39911 100644
--- a/perl-install/standalone/po/sv.po
+++ b/perl-install/standalone/po/sv.po
@@ -2925,8 +2925,8 @@ msgid ""
 "More info in the driver's manual page. Run the command \"man sane-%s\" to "
 "read it."
 msgstr ""
-"Mer information finns i drivrutinens manualsida. Kör kommandot \"man sane %s"
-"\" för att läsa manualen."
+"Mer information finns i drivrutinens manualsida. Kör kommandot \"man sane "
+"%s\" för att läsa manualen."
 
 #: scannerdrake:406 scannerdrake:415
 #, c-format