The package rpms/calamares.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/calamares.git/commit/?id=b49bc59a....
Change:
+ExclusiveArch: %{ix86} x86_64 aarch64
Thanks.
Full change:
============
commit b49bc59a5f11044f2d6132a01aa73c08c0c3e53a
Author: Neal Gompa <ngompa(a)fedoraproject.org>
Date: Sun Aug 22 13:18:45 2021 -0400
Update to 3.2.41.1
- Enable building for AArch64
diff --git a/.gitignore b/.gitignore
index b17bc1c..f65527f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@
/calamares-3.2.37.tar.gz
/calamares-3.2.38.tar.gz
/calamares-3.2.39.tar.gz
+/calamares-3.2.40.tar.gz
+/calamares-3.2.41.1.tar.gz
diff --git a/calamares-3.2.39-default-settings.patch
b/calamares-3.2.40-default-settings.patch
similarity index 69%
rename from calamares-3.2.39-default-settings.patch
rename to calamares-3.2.40-default-settings.patch
index 8ed577a..788c703 100644
--- a/calamares-3.2.39-default-settings.patch
+++ b/calamares-3.2.40-default-settings.patch
@@ -1,6 +1,6 @@
-diff -rup calamares-3.2.39/CMakeLists.txt
calamares-3.2.39-default-settings/CMakeLists.txt
---- calamares-3.2.39/CMakeLists.txt 2021-03-19 09:23:08.000000000 -0400
-+++ calamares-3.2.39-default-settings/CMakeLists.txt 2021-03-19 16:01:05.087151965 -0400
+diff '--color=auto' -rup calamares-3.2.40/CMakeLists.txt
calamares-3.2.40-default-settings/CMakeLists.txt
+--- calamares-3.2.40/CMakeLists.txt 2021-07-14 03:29:20.000000000 -0400
++++ calamares-3.2.40-default-settings/CMakeLists.txt 2021-07-19 21:51:51.635073966 -0400
@@ -49,7 +49,7 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
### OPTIONS
@@ -10,9 +10,9 @@ diff -rup calamares-3.2.39/CMakeLists.txt
calamares-3.2.39-default-settings/CMak
option( INSTALL_POLKIT "Install Polkit configuration" ON )
option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
-diff -rup calamares-3.2.39/settings.conf calamares-3.2.39-default-settings/settings.conf
---- calamares-3.2.39/settings.conf 2021-03-19 09:23:08.000000000 -0400
-+++ calamares-3.2.39-default-settings/settings.conf 2021-03-19 16:01:05.089151958 -0400
+diff '--color=auto' -rup calamares-3.2.40/settings.conf
calamares-3.2.40-default-settings/settings.conf
+--- calamares-3.2.40/settings.conf 2021-07-14 03:29:20.000000000 -0400
++++ calamares-3.2.40-default-settings/settings.conf 2021-07-19 21:51:51.636073985 -0400
@@ -134,21 +134,22 @@ sequence:
- locale
- keyboard
@@ -52,9 +52,9 @@ diff -rup calamares-3.2.39/settings.conf
calamares-3.2.39-default-settings/setti
# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to
-diff -rup calamares-3.2.39/src/branding/default/branding.desc
calamares-3.2.39-default-settings/src/branding/default/branding.desc
---- calamares-3.2.39/src/branding/default/branding.desc 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/branding/default/branding.desc 2021-03-19
16:01:05.090151955 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/branding/default/branding.desc
calamares-3.2.40-default-settings/src/branding/default/branding.desc
+--- calamares-3.2.40/src/branding/default/branding.desc 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/branding/default/branding.desc 2021-07-19
21:51:51.636073985 -0400
@@ -122,12 +122,12 @@ navigation: widget
# are set to "true" (they can also be overridden).
strings:
@@ -74,9 +74,9 @@ diff -rup calamares-3.2.39/src/branding/default/branding.desc
calamares-3.2.39-d
productUrl:
https://calamares.io/
supportUrl:
https://github.com/calamares/calamares/wiki
knownIssuesUrl:
https://github.com/calamares/calamares/issues
-diff -rup calamares-3.2.39/src/modules/bootloader/bootloader.conf
calamares-3.2.39-default-settings/src/modules/bootloader/bootloader.conf
---- calamares-3.2.39/src/modules/bootloader/bootloader.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/bootloader/bootloader.conf 2021-03-19
16:01:05.091151951 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/bootloader/bootloader.conf
calamares-3.2.40-default-settings/src/modules/bootloader/bootloader.conf
+--- calamares-3.2.40/src/modules/bootloader/bootloader.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/bootloader/bootloader.conf 2021-07-19
21:51:51.637074004 -0400
@@ -7,7 +7,7 @@
---
# Define which bootloader you want to use for EFI installations
@@ -112,18 +112,18 @@ diff -rup calamares-3.2.39/src/modules/bootloader/bootloader.conf
calamares-3.2.
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
-diff -rup calamares-3.2.39/src/modules/keyboard/keyboard.conf
calamares-3.2.39-default-settings/src/modules/keyboard/keyboard.conf
---- calamares-3.2.39/src/modules/keyboard/keyboard.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/keyboard/keyboard.conf 2021-03-19
16:01:05.092151948 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/keyboard/keyboard.conf
calamares-3.2.40-default-settings/src/modules/keyboard/keyboard.conf
+--- calamares-3.2.40/src/modules/keyboard/keyboard.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/keyboard/keyboard.conf 2021-07-19
21:51:51.637074004 -0400
@@ -20,4 +20,4 @@ convertedKeymapPath: "/lib/kbd/keymaps/x
# Write keymap configuration to /etc/default/keyboard, usually
# found on Debian-related systems.
# Defaults to true if nothing is set.
-#writeEtcDefaultKeyboard: true
+writeEtcDefaultKeyboard: false
-diff -rup calamares-3.2.39/src/modules/license/license.conf
calamares-3.2.39-default-settings/src/modules/license/license.conf
---- calamares-3.2.39/src/modules/license/license.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/license/license.conf 2021-03-19
16:01:05.093151945 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/license/license.conf
calamares-3.2.40-default-settings/src/modules/license/license.conf
+--- calamares-3.2.40/src/modules/license/license.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/license/license.conf 2021-07-19
21:51:51.637074004 -0400
@@ -22,24 +22,12 @@
# default, rather than requiring the user to first open it up.
# YAML: boolean, optional, default is false.
@@ -153,9 +153,9 @@ diff -rup calamares-3.2.39/src/modules/license/license.conf
calamares-3.2.39-def
# This example uses a file: link. This example uses a relative link, which
# is relative to where you run Calamares. Assuming you run it from build/
# as part of your testing, you'll get the LICENSE text for Calamares
-diff -rup calamares-3.2.39/src/modules/locale/locale.conf
calamares-3.2.39-default-settings/src/modules/locale/locale.conf
---- calamares-3.2.39/src/modules/locale/locale.conf 2021-03-19 09:23:08.000000000 -0400
-+++ calamares-3.2.39-default-settings/src/modules/locale/locale.conf 2021-03-19
16:01:05.094151941 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/locale/locale.conf
calamares-3.2.40-default-settings/src/modules/locale/locale.conf
+--- calamares-3.2.40/src/modules/locale/locale.conf 2021-07-14 03:29:20.000000000 -0400
++++ calamares-3.2.40-default-settings/src/modules/locale/locale.conf 2021-07-19
21:51:51.638074023 -0400
@@ -118,8 +118,8 @@ zone: "New_York"
#
geoip:
@@ -167,9 +167,9 @@ diff -rup calamares-3.2.39/src/modules/locale/locale.conf
calamares-3.2.39-defau
# For testing purposes, you could use *fixed* style, to see how Calamares
# behaves in a particular zone:
-diff -rup calamares-3.2.39/src/modules/mount/mount.conf
calamares-3.2.39-default-settings/src/modules/mount/mount.conf
---- calamares-3.2.39/src/modules/mount/mount.conf 2021-03-19 09:23:08.000000000 -0400
-+++ calamares-3.2.39-default-settings/src/modules/mount/mount.conf 2021-03-28
01:45:48.164897578 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/mount/mount.conf
calamares-3.2.40-default-settings/src/modules/mount/mount.conf
+--- calamares-3.2.40/src/modules/mount/mount.conf 2021-07-14 03:29:20.000000000 -0400
++++ calamares-3.2.40-default-settings/src/modules/mount/mount.conf 2021-07-19
21:51:51.638074023 -0400
@@ -47,10 +47,9 @@ extraMountsEfi:
btrfsSubvolumes:
@@ -186,9 +186,9 @@ diff -rup calamares-3.2.39/src/modules/mount/mount.conf
calamares-3.2.39-default
- subvolume: /@log
\ No newline at end of file
+
-diff -rup calamares-3.2.39/src/modules/netinstall/netinstall.conf
calamares-3.2.39-default-settings/src/modules/netinstall/netinstall.conf
---- calamares-3.2.39/src/modules/netinstall/netinstall.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/netinstall/netinstall.conf 2021-03-19
16:01:05.097151931 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/netinstall/netinstall.conf
calamares-3.2.40-default-settings/src/modules/netinstall/netinstall.conf
+--- calamares-3.2.40/src/modules/netinstall/netinstall.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/netinstall/netinstall.conf 2021-07-19
21:51:51.639074042 -0400
@@ -69,7 +69,9 @@
# they are interpreted like the *groups* key below. The special case
# `local` loads the data directly from **this** file.
@@ -200,10 +200,10 @@ diff -rup calamares-3.2.39/src/modules/netinstall/netinstall.conf
calamares-3.2.
# Alternate form:
# groupsUrl: [ local ]
-diff -rup calamares-3.2.39/src/modules/packages/packages.conf
calamares-3.2.39-default-settings/src/modules/packages/packages.conf
---- calamares-3.2.39/src/modules/packages/packages.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/packages/packages.conf 2021-03-19
16:01:05.098151928 -0400
-@@ -18,7 +18,7 @@
+diff '--color=auto' -rup calamares-3.2.40/src/modules/packages/packages.conf
calamares-3.2.40-default-settings/src/modules/packages/packages.conf
+--- calamares-3.2.40/src/modules/packages/packages.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/packages/packages.conf 2021-07-19
21:51:51.639074042 -0400
+@@ -35,7 +35,7 @@
# Not actually a package manager, but suitable for testing:
# - dummy - Dummy manager, only logs
#
@@ -212,7 +212,7 @@ diff -rup calamares-3.2.39/src/modules/packages/packages.conf
calamares-3.2.39-d
#
# Often package installation needs an internet connection.
-@@ -42,7 +42,7 @@ backend: dummy
+@@ -59,7 +59,7 @@ backend: dummy
# Therefore set also "update_system" to 'true'.
#
skip_if_no_internet: false
@@ -221,7 +221,7 @@ diff -rup calamares-3.2.39/src/modules/packages/packages.conf
calamares-3.2.39-d
update_system: false
#
-@@ -168,12 +168,5 @@ update_system: false
+@@ -185,12 +185,5 @@ update_system: false
# of packages, this can lead to a considerable time savings.
#
operations:
@@ -236,9 +236,9 @@ diff -rup calamares-3.2.39/src/modules/packages/packages.conf
calamares-3.2.39-d
- - binutils
+ - try_remove:
+ - calamares
-diff -rup calamares-3.2.39/src/modules/partition/partition.conf
calamares-3.2.39-default-settings/src/modules/partition/partition.conf
---- calamares-3.2.39/src/modules/partition/partition.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/partition/partition.conf 2021-03-19
16:01:05.099151925 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/partition/partition.conf
calamares-3.2.40-default-settings/src/modules/partition/partition.conf
+--- calamares-3.2.40/src/modules/partition/partition.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/partition/partition.conf 2021-07-19
21:51:51.640074061 -0400
@@ -59,7 +59,7 @@ userSwapChoices:
# neverCreateSwap: false
@@ -248,18 +248,18 @@ diff -rup calamares-3.2.39/src/modules/partition/partition.conf
calamares-3.2.39
# Show/hide partition labels on manual partitioning page.
alwaysShowPartitionLabels: true
-@@ -137,7 +137,7 @@ initialSwapChoice: none
+@@ -136,7 +136,7 @@ initialSwapChoice: none
# If nothing is specified, Calamares defaults to "ext4".
#
# Names are case-sensitive and defined by KPMCore.
-defaultFileSystemType: "ext4"
+defaultFileSystemType: "btrfs"
- # Show/hide LUKS related functionality in automated partitioning modes.
- # Disable this if you choose not to deploy early unlocking support in GRUB2
-diff -rup calamares-3.2.39/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.39-default-settings/src/modules/plasmalnf/plasmalnf.conf
---- calamares-3.2.39/src/modules/plasmalnf/plasmalnf.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-03-19
16:01:05.100151921 -0400
+ # Selectable filesystem type, used when "erase" is done.
+ #
+diff '--color=auto' -rup calamares-3.2.40/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.40-default-settings/src/modules/plasmalnf/plasmalnf.conf
+--- calamares-3.2.40/src/modules/plasmalnf/plasmalnf.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/plasmalnf/plasmalnf.conf 2021-07-19
21:51:51.640074061 -0400
@@ -22,7 +22,7 @@ lnftool: "/usr/bin/lookandfeeltool"
# to the originating username; the lnftool will be run through
# "sudo -H -u <liveuser>" instead of directly.
@@ -299,9 +299,9 @@ diff -rup calamares-3.2.39/src/modules/plasmalnf/plasmalnf.conf
calamares-3.2.39
# You can pre-select one of the themes; it is not applied
# immediately, but its radio-button is switched on to indicate
-diff -rup calamares-3.2.39/src/modules/tracking/tracking.conf
calamares-3.2.39-default-settings/src/modules/tracking/tracking.conf
---- calamares-3.2.39/src/modules/tracking/tracking.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/tracking/tracking.conf 2021-03-19
16:01:05.101151918 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/tracking/tracking.conf
calamares-3.2.40-default-settings/src/modules/tracking/tracking.conf
+--- calamares-3.2.40/src/modules/tracking/tracking.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/tracking/tracking.conf 2021-07-19
21:51:51.641074079 -0400
@@ -54,13 +54,13 @@
# This is the global policy; it is displayed as a link on the page.
# If blank or commented out, no link is displayed on the tracking
@@ -318,9 +318,9 @@ diff -rup calamares-3.2.39/src/modules/tracking/tracking.conf
calamares-3.2.39-d
# The install area has one specific configuration key:
# url: this URL (remember to include the protocol, and prefer https)
-diff -rup calamares-3.2.39/src/modules/umount/umount.conf
calamares-3.2.39-default-settings/src/modules/umount/umount.conf
---- calamares-3.2.39/src/modules/umount/umount.conf 2021-03-19 09:23:08.000000000 -0400
-+++ calamares-3.2.39-default-settings/src/modules/umount/umount.conf 2021-03-19
16:01:05.101151918 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/umount/umount.conf
calamares-3.2.40-default-settings/src/modules/umount/umount.conf
+--- calamares-3.2.40/src/modules/umount/umount.conf 2021-07-14 03:29:20.000000000 -0400
++++ calamares-3.2.40-default-settings/src/modules/umount/umount.conf 2021-07-19
21:51:51.641074079 -0400
@@ -18,8 +18,8 @@
---
# example when using the normal Calamares log:
@@ -332,9 +332,9 @@ diff -rup calamares-3.2.39/src/modules/umount/umount.conf
calamares-3.2.39-defau
-#srcLog: "/home/live/installation.log"
+#srcLog: "/home/liveuser/installation.log"
#destLog: "/var/log/installation.log"
-diff -rup calamares-3.2.39/src/modules/unpackfs/unpackfs.conf
calamares-3.2.39-default-settings/src/modules/unpackfs/unpackfs.conf
---- calamares-3.2.39/src/modules/unpackfs/unpackfs.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/unpackfs/unpackfs.conf 2021-03-19
16:01:05.102151915 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/unpackfs/unpackfs.conf
calamares-3.2.40-default-settings/src/modules/unpackfs/unpackfs.conf
+--- calamares-3.2.40/src/modules/unpackfs/unpackfs.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/unpackfs/unpackfs.conf 2021-07-19
21:51:51.642074098 -0400
@@ -88,13 +88,6 @@
# for its destination name, as in the example below.
@@ -352,9 +352,9 @@ diff -rup calamares-3.2.39/src/modules/unpackfs/unpackfs.conf
calamares-3.2.39-d
+ - source: "/dev/mapper/live-base"
+ sourcefs: "ext4"
+ destination: ""
-diff -rup calamares-3.2.39/src/modules/users/users.conf
calamares-3.2.39-default-settings/src/modules/users/users.conf
---- calamares-3.2.39/src/modules/users/users.conf 2021-03-19 09:23:08.000000000 -0400
-+++ calamares-3.2.39-default-settings/src/modules/users/users.conf 2021-03-19
16:01:05.103151911 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/users/users.conf
calamares-3.2.40-default-settings/src/modules/users/users.conf
+--- calamares-3.2.40/src/modules/users/users.conf 2021-07-14 03:29:20.000000000 -0400
++++ calamares-3.2.40-default-settings/src/modules/users/users.conf 2021-07-19
21:51:51.642074098 -0400
@@ -34,8 +34,7 @@ defaultGroups:
system: true
- lp
@@ -405,9 +405,9 @@ diff -rup calamares-3.2.39/src/modules/users/users.conf
calamares-3.2.39-default
# Hostname setting
#
-diff -rup calamares-3.2.39/src/modules/welcome/welcome.conf
calamares-3.2.39-default-settings/src/modules/welcome/welcome.conf
---- calamares-3.2.39/src/modules/welcome/welcome.conf 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-default-settings/src/modules/welcome/welcome.conf 2021-03-19
16:01:05.104151908 -0400
+diff '--color=auto' -rup calamares-3.2.40/src/modules/welcome/welcome.conf
calamares-3.2.40-default-settings/src/modules/welcome/welcome.conf
+--- calamares-3.2.40/src/modules/welcome/welcome.conf 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-default-settings/src/modules/welcome/welcome.conf 2021-07-19
21:51:51.643074117 -0400
@@ -23,7 +23,7 @@ showSupportUrl: true
showKnownIssuesUrl: true
showReleaseNotesUrl: false
diff --git a/calamares-3.2.39-kdesu.patch b/calamares-3.2.40-kdesu.patch
similarity index 66%
rename from calamares-3.2.39-kdesu.patch
rename to calamares-3.2.40-kdesu.patch
index ed2211e..80a2258 100644
--- a/calamares-3.2.39-kdesu.patch
+++ b/calamares-3.2.40-kdesu.patch
@@ -1,6 +1,6 @@
-diff -rup calamares-3.2.39-default-settings/calamares.desktop
calamares-3.2.39-kdesu/calamares.desktop
---- calamares-3.2.39-default-settings/calamares.desktop 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-kdesu/calamares.desktop 2021-03-19 23:14:47.355166565 -0400
+diff '--color=auto' -rup calamares-3.2.40-default-settings/calamares.desktop
calamares-3.2.40-kdesu/calamares.desktop
+--- calamares-3.2.40-default-settings/calamares.desktop 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-kdesu/calamares.desktop 2021-07-19 21:55:46.741513321 -0400
@@ -5,7 +5,7 @@ Name=Install System
GenericName=System Installer
Keywords=calamares;system;installer;
@@ -10,9 +10,9 @@ diff -rup calamares-3.2.39-default-settings/calamares.desktop
calamares-3.2.39-k
Comment=Calamares — System Installer
Icon=calamares
Terminal=false
-diff -rup calamares-3.2.39-default-settings/calamares.desktop.in
calamares-3.2.39-kdesu/calamares.desktop.in
---- calamares-3.2.39-default-settings/calamares.desktop.in 2021-03-19 09:23:08.000000000
-0400
-+++ calamares-3.2.39-kdesu/calamares.desktop.in 2021-03-19 23:14:47.356166561 -0400
+diff '--color=auto' -rup calamares-3.2.40-default-settings/calamares.desktop.in
calamares-3.2.40-kdesu/calamares.desktop.in
+--- calamares-3.2.40-default-settings/calamares.desktop.in 2021-07-14 03:29:20.000000000
-0400
++++ calamares-3.2.40-kdesu/calamares.desktop.in 2021-07-19 21:55:46.742513340 -0400
@@ -5,7 +5,7 @@ Name=Install System
GenericName=System Installer
Keywords=calamares;system;installer;
@@ -22,9 +22,9 @@ diff -rup calamares-3.2.39-default-settings/calamares.desktop.in
calamares-3.2.3
Comment=Calamares — System Installer
Icon=calamares
Terminal=false
-diff -rup calamares-3.2.39-default-settings/CMakeLists.txt
calamares-3.2.39-kdesu/CMakeLists.txt
---- calamares-3.2.39-default-settings/CMakeLists.txt 2021-03-19 16:01:05.087151965 -0400
-+++ calamares-3.2.39-kdesu/CMakeLists.txt 2021-03-19 23:14:47.357166558 -0400
+diff '--color=auto' -rup calamares-3.2.40-default-settings/CMakeLists.txt
calamares-3.2.40-kdesu/CMakeLists.txt
+--- calamares-3.2.40-default-settings/CMakeLists.txt 2021-07-19 21:51:51.635073966 -0400
++++ calamares-3.2.40-kdesu/CMakeLists.txt 2021-07-19 21:55:46.743513358 -0400
@@ -50,7 +50,6 @@ set( CALAMARES_VERSION_RC 0 ) # Set to
### OPTIONS
#
@@ -33,7 +33,7 @@ diff -rup calamares-3.2.39-default-settings/CMakeLists.txt
calamares-3.2.39-kdes
option( INSTALL_COMPLETION "Install shell completions" OFF )
# Options for the calamares executable
option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) # TODO:3.3:
WITH->BUILD (this isn't an ABI thing)
-@@ -282,18 +281,6 @@ endif()
+@@ -272,18 +271,6 @@ endif()
find_package( Qt5DBus CONFIG )
find_package( YAMLCPP ${YAMLCPP_VERSION} REQUIRED )
@@ -52,7 +52,7 @@ diff -rup calamares-3.2.39-default-settings/CMakeLists.txt
calamares-3.2.39-kdes
# Find ECM once, and add it to the module search path; Calamares
# modules that need ECM can do
-@@ -631,13 +618,6 @@ if( INSTALL_CONFIG )
+@@ -611,13 +598,6 @@ if( INSTALL_CONFIG )
)
endif()
diff --git a/calamares.spec b/calamares.spec
index eeb3851..cedf628 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -4,7 +4,7 @@
#global prerelease beta2
# For rpmdev-bumpspec and releng scripts
-%global baserelease 6
+%global baserelease 1
# do not use QtWebEngine because it no longer works with QtWebEngine >= 5.11
# (it now refuses to run as root unless "export
QTWEBENGINE_DISABLE_SANDBOX=1")
@@ -17,7 +17,7 @@
%endif
Name: calamares
-Version: 3.2.39
+Version: 3.2.41.1
Release: %{baserelease}%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c
-13)}%{!?snaphash:%{?prerelease:.%{prerelease}}}%{?dist}
Summary: Installer from a live CD/DVD/USB to disk
@@ -39,15 +39,14 @@ Source4: calamares-auto_de.ts
Source5: calamares-auto_it.ts
# adjust some default settings (default shipped .conf files)
-Patch0: calamares-3.2.39-default-settings.patch
+Patch0: calamares-3.2.40-default-settings.patch
# use kdesu instead of pkexec (works around #1171779)
-Patch1: calamares-3.2.39-kdesu.patch
+Patch1: calamares-3.2.40-kdesu.patch
# Calamares is only supported where live images (and GRUB) are. (#1171380)
# This list matches the arches where grub2-efi is used to boot the system
-## NOTE: aarch64 needs some upstream work before it can be added to this list
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 aarch64
# Macros
BuildRequires: kf5-rpm-macros
@@ -361,6 +360,10 @@ EOF
%changelog
+* Sun Aug 22 2021 Neal Gompa <ngompa(a)fedoraproject.org> - 3.2.41.1-1
+- Update to 3.2.41.1
+- Enable building for AArch64
+
* Fri Aug 06 2021 Jonathan Wakely <jwakely(a)redhat.com> - 3.2.39-6
- Rebuilt for Boost 1.76
diff --git a/sources b/sources
index fddc50f..fe65f84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calamares-3.2.39.tar.gz) =
0676a1c038d0b8b260b2228f8c7ff0a8a0b670705e50ef3e0a695dd7bea43a28a299c5eaefdd5eba28eeb2558f02f61c0b0fe01b0b817489b9a4879128a85889
+SHA512 (calamares-3.2.41.1.tar.gz) =
65f108405e5fd36f88bee3f66f2ea6bc1c45581d033a9565c813648dcb4b3c38ece40203d9f3d728a53504d06d9e215d0f7960a21834d7781fa288b78d046be8