diff --git a/.files b/.files
index 22c3411..884eec3 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d530a4c..afb4340 100644
--- a/.rev
+++ b/.rev
@@ -164,4 +164,12 @@
872178
+
+ 6052ad39dbd6f61026fb1430182dca45
+ 3.2.62
+
+ anag+factory
+
+ 1098485
+
diff --git a/3.2-bootloader.conf.patch b/3.2-bootloader.conf.patch
index 37c330a..2ef554f 100644
--- a/3.2-bootloader.conf.patch
+++ b/3.2-bootloader.conf.patch
@@ -4,7 +4,7 @@ GRUB2 is default bootloader in openSUSE and openSUSE based appliances.
diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
-@@ -26,10 +26,10 @@
+@@ -33,10 +33,10 @@ timeout: "10"
# GRUB functionality (notably grub-probe) to work. As needed, you may use
# complete paths like `/usr/bin/efibootmgr` for the executables.
#
diff --git a/3.2-networkcfg.patch b/3.2-networkcfg.patch
index 0876044..d9329f9 100644
--- a/3.2-networkcfg.patch
+++ b/3.2-networkcfg.patch
@@ -8,12 +8,11 @@ and created automatically anyway.
--- a/src/modules/networkcfg/main.py 2020-12-07 18:09:14.000000000 +0200
+++ b/src/modules/networkcfg/main.py 2021-01-31 19:47:20.012191085 +0200
-@@ -69,21 +69,21 @@
+@@ -132,20 +132,20 @@ def run():
pass
-
+
# We need to overwrite the default resolv.conf in the chroot.
-- source_resolv = "/etc/resolv.conf"
-- target_resolv = os.path.join(root_mount_point, "etc/resolv.conf")
+- source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf")
- if source_resolv != target_resolv and os.path.exists(source_resolv):
- try:
- os.remove(target_resolv)
@@ -21,27 +20,28 @@ and created automatically anyway.
- libcalamares.utils.debug(
- "Couldn't remove {}: {}".format(target_resolv, err)
- )
-+ #source_resolv = "/etc/resolv.conf"
-+ #target_resolv = os.path.join(root_mount_point, "etc/resolv.conf")
-+ #if source_resolv != target_resolv and os.path.exists(source_resolv):
-+ # try:
-+ # os.remove(target_resolv)
-+ # except Exception as err:
-+ # libcalamares.utils.debug(
-+ # "Couldn't remove {}: {}".format(target_resolv, err)
-+ # )
-
+-
- try:
-- shutil.copy(source_resolv, target_resolv)
+- shutil.copy(source_resolv, target_resolv, follow_symlinks=False)
- except Exception as err:
- libcalamares.utils.debug(
- "Can't copy resolv.conf from {}: {}".format(source_resolv, err)
- )
-+ # try:
-+ # shutil.copy(source_resolv, target_resolv)
-+ # except Exception as err:
-+ # libcalamares.utils.debug(
-+ # "Can't copy resolv.conf from {}: {}".format(source_resolv, err)
-+ # )
-
++# source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf")
++# if source_resolv != target_resolv and os.path.exists(source_resolv):
++# try:
++# os.remove(target_resolv)
++# except Exception as err:
++# libcalamares.utils.debug(
++# "Couldn't remove {}: {}".format(target_resolv, err)
++# )
++#
++# try:
++# shutil.copy(source_resolv, target_resolv, follow_symlinks=False)
++# except Exception as err:
++# libcalamares.utils.debug(
++# "Can't copy resolv.conf from {}: {}".format(source_resolv, err)
++# )
+
return None
+
diff --git a/3.2-packages.conf.patch b/3.2-packages.conf.patch
index 6237efd..79621f8 100644
--- a/3.2-packages.conf.patch
+++ b/3.2-packages.conf.patch
@@ -5,7 +5,7 @@ Calamares packages is no longer needed after installation.
diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf
--- a/src/modules/packages/packages.conf
+++ b/src/modules/packages/packages.conf
-@@ -13,7 +13,7 @@
+@@ -35,7 +35,7 @@
# Not actually a package manager, but suitable for testing:
# - dummy - Dummy manager, only logs
#
@@ -14,7 +14,7 @@ diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.
#
# Often package installation needs an internet connection.
-@@ -37,7 +37,7 @@
+@@ -59,7 +59,7 @@ backend: dummy
# Therefore set also "update_system" to 'true'.
#
skip_if_no_internet: false
@@ -22,8 +22,8 @@ diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.
+update_db: false
update_system: false
- #
-@@ -163,12 +163,6 @@
+ # pacman specific options
+@@ -202,12 +202,6 @@ pacman:
# of packages, this can lead to a considerable time savings.
#
operations:
diff --git a/3.2-settings.conf.patch b/3.2-settings.conf.patch
index 3443108..899cc49 100644
--- a/3.2-settings.conf.patch
+++ b/3.2-settings.conf.patch
@@ -10,7 +10,8 @@ Thus here we justion mention this option, but not enabling.
diff --git a/settings.conf b/settings.conf
--- a/settings.conf
+++ b/settings.conf
-@@ -111,16 +111,18 @@
+@@ -139,17 +139,19 @@ sequence:
+ # - luksopenswaphookcfg
# - dracutlukscfg
# - plymouthcfg
- - initcpiocfg
diff --git a/3.2-show.qml.patch b/3.2-show.qml.patch
index 0cf3c69..3a467e4 100644
--- a/3.2-show.qml.patch
+++ b/3.2-show.qml.patch
@@ -3,7 +3,7 @@ Comment explanatory parts
diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml
--- a/src/branding/default/show.qml
+++ b/src/branding/default/show.qml
-@@ -28,7 +28,7 @@
+@@ -19,7 +19,7 @@ Presentation
console.log("QML Component (default slideshow) Next slide");
presentation.goToNextSlide();
}
@@ -12,7 +12,7 @@ diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml
Timer {
id: advanceTimer
interval: 1000
-@@ -36,7 +36,7 @@
+@@ -27,7 +27,7 @@ Presentation
repeat: true
onTriggered: nextSlide()
}
@@ -21,7 +21,7 @@ diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml
Slide {
Image {
-@@ -46,6 +46,7 @@
+@@ -37,6 +37,7 @@ Presentation
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
@@ -29,7 +29,7 @@ diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml
Text {
anchors.horizontalCenter: background.horizontalCenter
anchors.top: background.bottom
-@@ -58,8 +59,9 @@
+@@ -49,8 +50,9 @@ Presentation
width: presentation.width
horizontalAlignment: Text.Center
}
@@ -40,7 +40,7 @@ diff -ur a/src/branding/default/show.qml b/src/branding/default/show.qml
Slide {
centeredText: qsTr("This is a second Slide element.")
}
-@@ -67,7 +69,7 @@
+@@ -58,7 +60,7 @@ Presentation
Slide {
centeredText: qsTr("This is a third Slide element.")
}
diff --git a/3.2-welcome.conf.patch b/3.2-welcome.conf.patch
index a0c80b4..adc8b34 100644
--- a/3.2-welcome.conf.patch
+++ b/3.2-welcome.conf.patch
@@ -1,26 +1,26 @@
-Calamares is often used in openSUSE based appliances, thus
+Calamares is often used in openSUSE based appliances, thus
it is better not to show URLs at first dialog.
Internet connection is not mandatory for installation.
diff -ur a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf
--- a/src/modules/welcome/welcome.conf
+++ b/src/modules/welcome/welcome.conf
-@@ -12,10 +12,10 @@
+@@ -19,11 +19,11 @@
+ #
# The setting can also be a full URL which will then be used
- # instead of the one from the branding file, or empty or not-set
- # which will hide the button.
+ # instead of the one from the branding file.
-showSupportUrl: true
-showKnownIssuesUrl: true
+showSupportUrl: false
+showKnownIssuesUrl: false
showReleaseNotesUrl: false
+ # TODO:3.3 Move to branding, keep only a bool here
-showDonateUrl: https://kde.org/community/donations/
-+#showDonateUrl: https://kde.org/community/donations/
++#showDonateUrl: https://kde.org/community/donations/
# Requirements checking. These are general, generic, things
# that are checked. They may not match with the actual requirements
-
-@@ -42,7 +42,6 @@
+@@ -68,7 +68,6 @@ requirements:
- storage
- ram
- power
diff --git a/3.2.15-configuring_autologin_in_sysconfig.patch b/3.2.15-configuring_autologin_in_sysconfig.patch
index 2eb77e5..2a19a5d 100644
--- a/3.2.15-configuring_autologin_in_sysconfig.patch
+++ b/3.2.15-configuring_autologin_in_sysconfig.patch
@@ -6,7 +6,7 @@ configuration file.
--- a/src/modules/displaymanager/displaymanager.conf
+++ b/src/modules/displaymanager/displaymanager.conf
-@@ -13,13 +13,7 @@
+@@ -16,14 +16,7 @@
# is attempted. You can also list "sysconfig" in this list instead.
#
displaymanagers:
@@ -17,11 +17,12 @@ configuration file.
- - mdm
- - lxdm
- - kdm
-+ sysconfig
+- - greetd
++ - sysconfig
# Enable the following settings to force a desktop environment
# in your displaymanager configuration file. This will attempt
-@@ -55,4 +55,4 @@
+@@ -59,4 +52,4 @@ basicSetup: false
# The preferred way to pick sysconfig is to just list it in the
# *displaymanagers* list (as the only one).
#
diff --git a/3.2.15-unpackfs.conf_Leap15.patch b/3.2.15-unpackfs.conf_Leap15.patch
index 00d23d0..633f999 100644
--- a/3.2.15-unpackfs.conf_Leap15.patch
+++ b/3.2.15-unpackfs.conf_Leap15.patch
@@ -7,8 +7,8 @@ https://github.com/OSInside/kiwi/issues/1558
https://github.com/OSInside/kiwi/commit/89f85e45041eb39f686f6b20f909a20bb48277cc#diff-473d8885cf8c5da1798144d6eaeb94c386af31c776c34336331040ca49b667d8
diff -ruN a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf
---- a/src/modules/unpackfs/unpackfs.conf 2020-11-16 18:28:28.000000000 +0700
-+++ b/src/modules/unpackfs/unpackfs.conf 2020-11-19 22:47:42.918846533 +0700
+--- a/src/modules/unpackfs/unpackfs.conf
++++ b/src/modules/unpackfs/unpackfs.conf
@@ -88,13 +88,15 @@
# for its destination name, as in the example below.
diff --git a/calamares-3.2.36.tar.gz b/calamares-3.2.36.tar.gz
deleted file mode 120000
index bb17c14..0000000
--- a/calamares-3.2.36.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiglpzdj2eriqsbao466f26y63qa62qz3ua7ocvcf4m2vy4mbwmyty
\ No newline at end of file
diff --git a/calamares-3.2.36.tar.gz.asc b/calamares-3.2.36.tar.gz.asc
deleted file mode 100644
index 83528c6..0000000
--- a/calamares-3.2.36.tar.gz.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCAAdFiEEhrjttu2OP5apuuy1z93JbxKxkVwFAmAa1XkACgkQz93JbxKx
-kVyR6wv/XwdfHemoQ5hHUOxrmzMiCsBzGwUmP/BuSJdtA4/9vd/kKGz/+ZxSbNqU
-1xAMb+WNDOfSv5WX210a2LuEXFuKoQzoiLUxYZONyP7hpmDvDGjiKNmVcyRPkGg9
-hxhneQvQM1CzN2/tGBtYzQTkn9LxZXKD+zkQgM22TtA20KYVzl1oPiVeWjKP/+PT
-woU5Ky43wQd9p5h50RnThe3pK0+k7vscXZxRcLIml/dbgv/N9jYjV7cztl/+5TjK
-7AGug4g5L8Xr0u44BBYgChM0SxZ47ipCWLh8bGoxL5bDjqEE9256K6Bnwdig0ZMg
-apXBGyISE8+fXilgFnIxlAfe6UhPer+LVp0Igp2vrNsnn+xcWSk3bxt8nHYzu2Zl
-1NLPF8M4HRd5nl1iD0hkJTFrEFrlllml4W+8XFiCD91u+uZo7ujCdKeOHSB3pMyY
-ZbmY8r7HIY16DJShvKwCfXpiQogjVdssb/Igx3OQQNBFejPjRGt0ujPlh8GwG7yK
-DpQLHmf8
-=FQA7
------END PGP SIGNATURE-----
diff --git a/calamares-3.2.62.tar.gz b/calamares-3.2.62.tar.gz
new file mode 120000
index 0000000..17177a6
--- /dev/null
+++ b/calamares-3.2.62.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeigwb4t6vnbuuko4djsrhucbfnzuouc3wnms3wy2vkmub54a3mmynm
\ No newline at end of file
diff --git a/calamares-3.2.62.tar.gz.asc b/calamares-3.2.62.tar.gz.asc
new file mode 100644
index 0000000..3e243ca
--- /dev/null
+++ b/calamares-3.2.62.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEAKzRXiWnn+4Ciw7lf+o9phacd9YFAmRG578ACgkQf+o9phac
+d9bAVg/7BT7CoTU7TuedkqX5wFaM/bB/37niIbnFRTtdo+BGw/q8thIkwX1WDOMe
+473lcR9vrvadMXOMAfkI1AAFHV7FTK09AgAwJdPWBaUBa3dLDeNMPPtFK8/4HANV
+s9EsCXAXcOOXXaUmL/NNqjqEoaEwJ9O8/Xro9gR+fJ+xtjyEVC48ebLc/PDoj/Wg
+SPlQ16jTgThN3IU5u2IgnR0eWAXW7dg0ZqxJu/j1LnBeDgnS7pb/xqYBN6qhNY+c
+6eEbwWbF+TTCh0DLxv1VJzt38pcCnppwhBofl1MreVUUcblGwHxo1vnz3vZ/R91P
+IzsMwyTtU+wTCjrbnHRduFlJEGB5UsRGEEEufX5CPIufBE7MRL94aKBuazMVWmbg
+mvWDm2m6GDDBgg0LkYI9SO+vPQtKTVXmYrQOi3FHkRjzoLhFkToihExR/f/4Oe+K
+h4s4ygznoRAvxQCbUEvq5rgW5A3RcVGF9WIawrzsJQoH0q3iwg6Koo5mZSrvjmPz
+xnSMLHxPWQEyq5EGdZV+YG7KSKxgtSr7TMsei6ceTQyydCf9Dd8ncn/+KV/TTx8t
+xW1Y/uHxY+ABc0nbBpaFMlkauXyvaMEpMQG+IYNS7XBuqN4k+VPKgoZrEMOmErQc
+/GtXdpDesbeVQ828DrXAyQZbA6nh0ZLTeAHetPDu43MKW5dYd2A=
+=r/HG
+-----END PGP SIGNATURE-----
diff --git a/calamares-desktop-file.patch b/calamares-desktop-file.patch
index f3d503e..d442e7b 100644
--- a/calamares-desktop-file.patch
+++ b/calamares-desktop-file.patch
@@ -16,7 +16,7 @@ diff --git a/calamares.desktop b/calamares.desktop
GenericName=System Installer
Keywords=calamares;system;installer;
TryExec=calamares
--Exec=pkexec /usr/bin/calamares
+-Exec=sh -c "pkexec calamares"
+Exec=kdesu -c /usr/bin/calamares
Comment=Calamares — System Installer
Icon=calamares
diff --git a/calamares-rpmlintrc b/calamares-rpmlintrc
index e074f7c..862ef30 100644
--- a/calamares-rpmlintrc
+++ b/calamares-rpmlintrc
@@ -1,37 +1,5 @@
# /usr/lib/calamares/libcalamares.so is just symlink, without it Calamares does not work.
addFilter("calamares.*devel-file-in-non-devel-package.*/usr/lib.*/calamares/libcalamares.so.*")
-# warnings ignored intentionally by Calamares developers, see https://github.com/calamares/calamares/issues/729
-# calamares-libs3.i586: W: shared-lib-calls-exit /usr/lib/libcalamaresui.so.3.1.1 exit@GLIBC_2.0
-# calamares-libs3.i586: W: shared-lib-calls-exit /usr/lib/libcalamares.so.3.1.1 exit@GLIBC_2.0
-addFilter("calamares.*shared-lib-calls-exit /usr/lib.*/libcalamares.*exit@GLIBC.*")
-
-# Polkit pkexec is among requirements of Calamares for openSUSE Tumbleweed.
-addFilter("calamares.*desktopfile-without-binary.*calamares.desktop pkexec")
-
-# xdg-utils is among requirements of Calamares.
-addFilter("calamares.*desktopfile-without-binary.*calamares.desktop xdg-su")
-
# /usr/bin/kdesu provided by kde-cli-tools5, kde-cli-tools5 is among requirements of Calamares.
addFilter("calamares.*desktopfile-without-binary.*calamares.desktop kdesu")
-
-# despide of warning, `desktop-file-validate calamares.desktop` shows no errors
-addFilter("calamares.*: W: invalid-desktopfile /usr/share/applications/calamares.desktop")
-
-# man page for calamares_crash_reporter does not exist in upstream yet
-addFilter("calamares.*no-manual-page-for-binary calamares_crash_reporter.*")
-
-# We use: %post libs%{_sover} -p /sbin/ldconfig
-addFilter("calamares.*empty.*post")
-
-# Version here is not so important, because older branding should work with newer versions
-addFilter("calamares.*suse-branding-unversioned-requires calamares-branding")
-
-# Ignore duplicates of translation files
-addFilter("calamares.*: W: files-duplicate /usr/share/locale/.*/LC_MESSAGES/calamares-.*.mo /usr/share/locale/.*/LC_MESSAGES/calamares-.*.mo")
-
-# Calamares developers intentionally use unversioned libs,
-# they also don't guarantee stable API or ABI for libraries,
-# and libraries are not intented to be used by other programs
-# see https://github.com/calamares/calamares/issues/729#issuecomment-323846031
-addFilter("calamares.*: W: shlib-policy-missing-suffix")
diff --git a/calamares.changes b/calamares.changes
index 98b7164..eb996f0 100644
--- a/calamares.changes
+++ b/calamares.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Jun 2 14:08:03 UTC 2023 - Ana Guerrero
+
+- Update to version 3.2.62
+ * See changelog at https://github.com/calamares/calamares/blob/calamares/CHANGES-3.2
+- Refresh patches
+- Remove obsolete rpmlintrc entries
+- Update obsolete field Supplements using packageand
+
+-------------------------------------------------------------------
Mon Feb 8 11:17:52 UTC 2021 - andy great
- Update to version 3.2.36.
diff --git a/calamares.spec b/calamares.spec
index 51220d1..f88acd9 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,7 +1,7 @@
#
# spec file for package calamares
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%define _sover 3
Name: calamares
-Version: 3.2.36
+Version: 3.2.62
Release: 0
Summary: Installer from a live CD/DVD/USB to disk
License: GPL-3.0-or-later
@@ -129,13 +129,12 @@ Requires: %{name}%{?_isa} = %{version}
%description webview
Optional webview module for the Calamares installer.
-
%package branding-upstream
Summary: Branding for %{name}
# This theme is nor pure upstream, nor specific to openSUSE,
# but is close to upstream
Group: System/Management
-Supplements: packageand(%name:branding-upstream)
+Supplements: (%name and branding-upstream)
%if 0%{?sle_version} == 150000
Conflicts: otherproviders(%{name}-branding)
%endif
@@ -157,7 +156,7 @@ based custom appliances.
%autosetup -N
cp -f %{SOURCE3} src/branding/default/
%autopatch -p1
-# fix shebang
+# fix shebang
find . -wholename "./src/modules/*/main.py" -exec sed -re "1s/^#\!\/usr\/bin\/env python3/#\!\/usr\/bin\/python3/" -i {} \;
%build