calamares 3.2.12-2 (x86_64;znver1;i686) 2019-7952
-1

Submitter nobodydead [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/634948
Packages
calamares-3.2.12-2.x86_64.source
calamares-3.2.12-2.x86_64.binary
calamares-debuginfo-3.2.12-2.x86_64.debuginfo
lib64calamares3-3.2.12-2.x86_64.binary
lib64calamares3-debuginfo-3.2.12-2.x86_64.debuginfo
lib64calamares-devel-3.2.12-2.x86_64.binary
calamares-3.2.12-2.znver1.binary
calamares-3.2.12-2.znver1.source
calamares-debuginfo-3.2.12-2.znver1.debuginfo
lib64calamares3-3.2.12-2.znver1.binary
lib64calamares3-debuginfo-3.2.12-2.znver1.debuginfo
lib64calamares-devel-3.2.12-2.znver1.binary
calamares-3.2.12-2.i686.binary
calamares-3.2.12-2.i686.source
calamares-debuginfo-3.2.12-2.i686.debuginfo
libcalamares3-3.2.12-2.i686.binary
libcalamares3-debuginfo-3.2.12-2.i686.debuginfo
libcalamares-devel-3.2.12-2.i686.binary
Build Date 2019-10-19 17:15:15 +0000 UTC
Last Updated 2019-10-20 19:45:08.385748762 +0000 UTC
$ git diff --patch-with-stat --summary e17580e1c387696c323f422c2cfb903cb0b6f062..577b828c2cfee40fc675cee108529de9979ad9e4

 .abf.yml                                           |  2 +-
 ...-Try-to-guess-suggested-hostname-from-dmi.patch | 15 +++---
 ...0.17.0-20150112-openmandriva-desktop-file.patch | 26 +++++------
 ...s-3.2.7-dont-unmount-dev-mapper-live-base.patch | 16 -------
 calamares-3.2.7-unpackfs-dev.patch                 | 24 ----------
 calamares.spec                                     |  8 +---
 fa9aeb4a5d51882631047369a655fbda35e6ea07.patch     | 40 ----------------
 fix-storage-check.patch                            | 12 -----
 kpmcore4-api-1.patch                               | 53 +++++++++++-----------
 9 files changed, 49 insertions(+), 147 deletions(-)
 delete mode 100644 calamares-3.2.7-dont-unmount-dev-mapper-live-base.patch
 delete mode 100644 calamares-3.2.7-unpackfs-dev.patch
 delete mode 100644 fa9aeb4a5d51882631047369a655fbda35e6ea07.patch
 delete mode 100644 fix-storage-check.patch

diff --git a/.abf.yml b/.abf.yml
index 063c800..3e4587a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665
-  calamares-3.2.7.tar.gz: e18c4970277a774e691396a0f24696ed8b93ee20
+  calamares-3.2.12.tar.gz: dd5555a83df9bb4e2bb0215c3fa1a2506f0ae86b
diff --git a/0001-Try-to-guess-suggested-hostname-from-dmi.patch b/0001-Try-to-guess-suggested-hostname-from-dmi.patch
index 0f8622e..5d88071 100644
--- a/0001-Try-to-guess-suggested-hostname-from-dmi.patch
+++ b/0001-Try-to-guess-suggested-hostname-from-dmi.patch
@@ -1,15 +1,15 @@
-diff -Naur calamares-3.2.7/src/modules/users/UsersPage.cpp calamares-3.2.7-p/src/modules/users/UsersPage.cpp
---- calamares-3.2.7/src/modules/users/UsersPage.cpp	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/users/UsersPage.cpp	2019-05-05 20:31:21.081178113 +0200
-@@ -35,6 +35,7 @@
- #include "Settings.h"
+diff -up calamares-3.2.12/src/modules/users/UsersPage.cpp.3~ calamares-3.2.12/src/modules/users/UsersPage.cpp
+--- calamares-3.2.12/src/modules/users/UsersPage.cpp.3~	2019-08-07 12:58:22.000000000 +0200
++++ calamares-3.2.12/src/modules/users/UsersPage.cpp	2019-08-22 15:31:35.548605727 +0200
+@@ -40,6 +40,7 @@
+ #include "utils/String.h"
  
  #include <QBoxLayout>
 +#include <QFile>
  #include <QLabel>
  #include <QLineEdit>
  #include <QRegExp>
-@@ -272,7 +273,27 @@
+@@ -277,7 +278,27 @@ UsersPage::fillSuggestions()
      {
          if ( !cleanParts.isEmpty() && !cleanParts.first().isEmpty() )
          {
@@ -38,6 +38,3 @@ diff -Naur calamares-3.2.7/src/modules/users/UsersPage.cpp calamares-3.2.7-p/src
              if ( HOSTNAME_RX.indexIn( hostnameSuggestion ) != -1 )
              {
                  ui->textBoxHostname->setText( hostnameSuggestion );
--- 
-2.19.1
-
diff --git a/calamares-0.17.0-20150112-openmandriva-desktop-file.patch b/calamares-0.17.0-20150112-openmandriva-desktop-file.patch
index 8a2f86b..c5be31f 100644
--- a/calamares-0.17.0-20150112-openmandriva-desktop-file.patch
+++ b/calamares-0.17.0-20150112-openmandriva-desktop-file.patch
@@ -1,6 +1,6 @@
-diff -Naur calamares-3.2.0/calamares.desktop calamares-3.2.0.tpg/calamares.desktop
---- calamares-3.2.0/calamares.desktop	2018-05-17 15:13:54.000000000 +0000
-+++ calamares-3.2.0.tpg/calamares.desktop	2018-06-08 16:00:04.559239025 +0000
+diff -up calamares-3.2.12/calamares.desktop.1~ calamares-3.2.12/calamares.desktop
+--- calamares-3.2.12/calamares.desktop.1~	2019-08-22 15:28:36.975064504 +0200
++++ calamares-3.2.12/calamares.desktop	2019-08-22 15:30:12.972355573 +0200
 @@ -1,13 +1,13 @@
  [Desktop Entry]
  Type=Application
@@ -8,34 +8,34 @@ diff -Naur calamares-3.2.0/calamares.desktop calamares-3.2.0.tpg/calamares.deskt
 -Name=Install System
 -GenericName=System Installer
 +Name=Install OpenMandriva Lx
-+GenericName=OpenMandriva installer
- Keywords=calamares;system;installer
++GenericName=OpenMandriva Installer
+ Keywords=calamares;system;installer;
  TryExec=calamares
  Exec=pkexec /usr/bin/calamares
 -Comment=Calamares — System Installer
 -Icon=calamares
-+Comment=OpenMandriva Lx installer
++Comment=OpenMandriva Lx Installer
 +Icon=openmandriva-install
  Terminal=false
  StartupNotify=true
  Categories=Qt;System;
-diff -Naur calamares-3.2.0/calamares.desktop.in calamares-3.2.0.tpg/calamares.desktop.in
---- calamares-3.2.0/calamares.desktop.in	2018-05-17 15:13:54.000000000 +0000
-+++ calamares-3.2.0.tpg/calamares.desktop.in	2018-06-08 15:59:05.825242871 +0000
+diff -up calamares-3.2.12/calamares.desktop.in.1~ calamares-3.2.12/calamares.desktop.in
+--- calamares-3.2.12/calamares.desktop.in.1~	2019-08-22 15:28:36.975064504 +0200
++++ calamares-3.2.12/calamares.desktop.in	2019-08-22 15:30:55.552484597 +0200
 @@ -1,13 +1,13 @@
  [Desktop Entry]
  Type=Application
  Version=1.0
 -Name=Install System
 -GenericName=System Installer
-+Name=Install OpenMandriva Lx
-+GenericName=OpenMandriva installer
- Keywords=calamares;system;installer
++Name=Install OpenMandriva
++GenericName=OpenMandriva Lx Installer
+ Keywords=calamares;system;installer;
  TryExec=calamares
  Exec=pkexec /usr/bin/calamares
 -Comment=Calamares — System Installer
 -Icon=calamares
-+Comment=OpenMandriva Lx installer
++Comment=OpenMandriva Installer
 +Icon=openmandriva-install
  Terminal=false
  StartupNotify=true
diff --git a/calamares-3.2.7-dont-unmount-dev-mapper-live-base.patch b/calamares-3.2.7-dont-unmount-dev-mapper-live-base.patch
deleted file mode 100644
index 0ccc96c..0000000
--- a/calamares-3.2.7-dont-unmount-dev-mapper-live-base.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur calamares-3.2.7/src/modules/partition/jobs/ClearMountsJob.cpp calamares-3.2.7-dont-unmount-dev-mapper-live-base/src/modules/partition/jobs/ClearMountsJob.cpp
---- calamares-3.2.7/src/modules/partition/jobs/ClearMountsJob.cpp	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-dont-unmount-dev-mapper-live-base/src/modules/partition/jobs/ClearMountsJob.cpp	2019-05-06 02:33:37.366387934 +0200
-@@ -258,7 +258,11 @@
-     QProcess process;
-     for ( const QFileInfo &fi : fiList )
-     {
--        if ( fi.baseName() == "control" )
-+        QString baseName = fi.baseName();
-+        // Fedora live images use /dev/mapper/live-* internally. We must not
-+        // unmount those devices, because they are used by the live image and
-+        // because we need /dev/mapper/live-base in the unpackfs module.
-+        if ( baseName == "control" || baseName.startsWith( "live-" ) )
-             continue;
-         list.append( fi.absoluteFilePath() );
-     }
diff --git a/calamares-3.2.7-unpackfs-dev.patch b/calamares-3.2.7-unpackfs-dev.patch
deleted file mode 100644
index 5950ce7..0000000
--- a/calamares-3.2.7-unpackfs-dev.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur calamares-3.2.7/src/modules/unpackfs/main.py calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py
---- calamares-3.2.7/src/modules/unpackfs/main.py	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py	2019-05-06 00:49:55.325039262 +0200
-@@ -252,13 +252,19 @@
-             subprocess.check_call(["mount",
-                                    "--bind", entry.source,
-                                    imgmountdir])
--        else:
-+        elif os.path.isfile(entry.source):
-             subprocess.check_call(["mount",
-                                    entry.source,
-                                    imgmountdir,
-                                    "-t", entry.sourcefs,
-                                    "-o", "loop"
-                                    ])
-+        else: # entry.source is a device
-+            subprocess.check_call(["mount",
-+                                   entry.source,
-+                                   imgmountdir,
-+                                   "-t", entry.sourcefs
-+                                   ])
- 
-     def unpack_image(self, entry, imgmountdir):
-         """
diff --git a/calamares.spec b/calamares.spec
index 1bffe90..343a750 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -5,12 +5,12 @@
 
 Summary:	Distribution-independent installer framework
 Name:		calamares
-Version:	3.2.7
+Version:	3.2.12
 %if "%{git}" != ""
 Release:	0.%{git}.1
 Source0:	calamares-%{version}-%{git}.tar.xz
 %else
-Release:	5
+Release:	2
 # git archive --format=tar --prefix=calamares-1.1.0-$(date +%Y%m%d)/ HEAD | xz -vf > calamares-1.1.0-$(date +%Y%m%d).tar.xz
 #Source0:	calamares-%{version}-%{calamdate}.tar.xz
 Source0:	https://github.com/calamares/calamares/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -46,7 +46,6 @@ Source50:   49-nopasswd_calamares.rules
 Source51:   %{name}-live.sudo
 Source99:	openmandriva-install.svg
 Source100:	OpenMandriva-adverts.tar.xz
-Patch0:		https://github.com/calamares/calamares/commit/fa9aeb4a5d51882631047369a655fbda35e6ea07.patch
 Patch1:		calamares-0.17.0-20150112-openmandriva-desktop-file.patch
 # (crazy) why we need this?
 Patch2:		calamares-libparted-detection.patch
@@ -58,9 +57,6 @@ Patch5:		0001-services-systemd-support-sockets-timers-and-unmask.patch
 # (crazy) LVM disabled for now
 #  -- until it starts working properly
 Patch6:		0003-disable-lvm.patch
-Patch7:		fix-storage-check.patch
-Patch8:		https://src.fedoraproject.org/rpms/calamares/raw/master/f/calamares-3.2.7-unpackfs-dev.patch
-Patch9:		https://src.fedoraproject.org/rpms/calamares/raw/master/f/calamares-3.2.7-dont-unmount-dev-mapper-live-base.patch
 Patch10:	esp-to-boot-flag.patch
 Patch11:	kpmcore4-api-1.patch
 
diff --git a/fa9aeb4a5d51882631047369a655fbda35e6ea07.patch b/fa9aeb4a5d51882631047369a655fbda35e6ea07.patch
deleted file mode 100644
index eb00231..0000000
--- a/fa9aeb4a5d51882631047369a655fbda35e6ea07.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From fa9aeb4a5d51882631047369a655fbda35e6ea07 Mon Sep 17 00:00:00 2001
-From: Kevin Kofler <kevin.kofler@chello.at>
-Date: Sun, 5 May 2019 21:52:55 +0200
-Subject: [PATCH] CMake: Fix BoostPython3.cmake for Fedora >= 30
-
-CMakeModules/BoostPython3.cmake: Also try e.g. "python37" as the module
-name, because Fedora 30 switched from the e.g. "python-py37" format to
-that. Otherwise, Boost::Python3 cannot be found on Fedora without
-manually setting CALAMARES_BOOST_PYTHON3_COMPONENT.
----
- CMakeModules/BoostPython3.cmake | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/CMakeModules/BoostPython3.cmake b/CMakeModules/BoostPython3.cmake
-index c128b58f1..70fb0aa49 100644
---- a/CMakeModules/BoostPython3.cmake
-+++ b/CMakeModules/BoostPython3.cmake
-@@ -15,6 +15,11 @@
- # libboost_python-3.4.so
- # depending on what python's targets you selected during install
- #
-+# On Fedora >= 30 instead, the boost-python3-devel provides boost library with a
-+# name like:
-+# libboost_python37.so
-+# depending on what python's targets you selected during install
-+#
- # find_boost_python3() tries to find the package with different component
- # names. By default it tries "python3", "python-py$suffix" and
- # "python-$dotsuffix", where suffix is based on the `python_version` argument.
-@@ -46,6 +51,10 @@ macro( find_boost_python3 boost_version python_version found_var )
-     string( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\..*" "\\1\\2" _fbp_python_short_version ${python_version} )
-     _find_boost_python3_int( ${boost_version} python-py${_fbp_python_short_version} _fbp_found )
- 
-+    if (NOT _fbp_found)
-+        _find_boost_python3_int( ${boost_version} python${_fbp_python_short_version} _fbp_found )
-+    endif()
-+
-     if (NOT _fbp_found)
-         # The following loop changes the searched name for Gentoo based distributions
-         # turns "3.4.123abc" into "3.4"
diff --git a/fix-storage-check.patch b/fix-storage-check.patch
deleted file mode 100644
index 3340cdb..0000000
--- a/fix-storage-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur calamares-3.2.7/src/modules/welcome/checker/partman_devices.c calamares-3.2.7-p/src/modules/welcome/checker/partman_devices.c
---- calamares-3.2.7/src/modules/welcome/checker/partman_devices.c	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/welcome/checker/partman_devices.c	2019-05-03 18:39:38.789723224 +0200
-@@ -120,7 +120,7 @@
-     for (dev = NULL; NULL != (dev = ped_device_get_next(dev));)
-     {
-         long long dev_size = process_device(dev);
--        if (dev_size > required_space)
-+        if (dev_size >= required_space)
-         {
-             big_enough = true;
-             break;
diff --git a/kpmcore4-api-1.patch b/kpmcore4-api-1.patch
index 1c9344b..a871f68 100644
--- a/kpmcore4-api-1.patch
+++ b/kpmcore4-api-1.patch
@@ -1,18 +1,18 @@
-diff -Naur calamares-3.2.7/src/modules/fsresizer/CMakeLists.txt calamares-3.2.7-p/src/modules/fsresizer/CMakeLists.txt
---- calamares-3.2.7/src/modules/fsresizer/CMakeLists.txt	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/fsresizer/CMakeLists.txt	2019-06-13 18:02:46.258839673 +0200
+diff -up calamares-3.2.12/src/modules/fsresizer/CMakeLists.txt.8~ calamares-3.2.12/src/modules/fsresizer/CMakeLists.txt
+--- calamares-3.2.12/src/modules/fsresizer/CMakeLists.txt.8~	2019-08-22 15:33:02.881870140 +0200
++++ calamares-3.2.12/src/modules/fsresizer/CMakeLists.txt	2019-08-22 15:33:55.196028465 +0200
 @@ -1,4 +1,4 @@
 -find_package( KPMcore 3.3 )
 +find_package( KPMcore )
- find_package( Qt5 REQUIRED DBus )  # Needed for KPMCore
- find_package( KF5 REQUIRED I18n WidgetsAddons )  # Needed for KPMCore
  
-@@ -8,10 +8,10 @@
-     include_directories( ${KPMCORE_INCLUDE_DIR} )
-     include_directories( ${PROJECT_BINARY_DIR}/src/libcalamares )
+ set( _partition_defs "" )
+ 
+@@ -8,10 +8,10 @@ if ( KPMcore_FOUND )
+ 
+     include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition )
  
 -    if ( KPMcore_VERSION VERSION_GREATER "3.3.0")
-+    if ( KPMcore_VERSION VERSION_GREATER "3.3.0" AND KPMcore_VERSION LESS "3.80.0")
++    if ( KPMcore_VERSION VERSION_GREATER "3.3.0"  AND KPMcore_VERSION LESS "3.80.0")
          list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
      endif()
 -    if ( KPMcore_VERSION VERSION_GREATER "3.90")
@@ -20,23 +20,24 @@ diff -Naur calamares-3.2.7/src/modules/fsresizer/CMakeLists.txt calamares-3.2.7-
          list( APPEND _partition_defs WITH_KPMCORE4API) # kpmcore 4 with new API
      endif()
  
-diff -Naur calamares-3.2.7/src/modules/partition/CMakeLists.txt calamares-3.2.7-p/src/modules/partition/CMakeLists.txt
---- calamares-3.2.7/src/modules/partition/CMakeLists.txt	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/partition/CMakeLists.txt	2019-06-13 18:02:04.551550194 +0200
-@@ -20,17 +20,17 @@
- find_package( Qt5 REQUIRED DBus )
- find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons )
+diff -up calamares-3.2.12/src/modules/partition/CMakeLists.txt.8~ calamares-3.2.12/src/modules/partition/CMakeLists.txt
+--- calamares-3.2.12/src/modules/partition/CMakeLists.txt.8~	2019-08-22 15:33:02.881870140 +0200
++++ calamares-3.2.12/src/modules/partition/CMakeLists.txt	2019-08-22 15:34:22.747111827 +0200
+@@ -15,7 +15,7 @@ endif()
+ 
+ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
  
 -find_package( KPMcore 3.3 )
 +find_package( KPMcore )
  set_package_properties(
      KPMcore PROPERTIES
      PURPOSE "For partitioning module"
- )
+@@ -25,10 +25,10 @@ if ( KPMcore_FOUND )
+     find_package( Qt5 REQUIRED DBus )
+     find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons )
  
- if ( KPMcore_FOUND )
 -    if ( KPMcore_VERSION VERSION_GREATER "3.3.0")
-+    if ( KPMcore_VERSION VERSION_GREATER "3.3.0" AND KPMcore_VERSION LESS "3.80.0")
++    if ( KPMcore_VERSION VERSION_GREATER "3.3.0"  AND KPMcore_VERSION LESS "3.80.0")
          list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
      endif()
 -    if ( KPMcore_VERSION VERSION_GREATER "3.90")
@@ -44,10 +45,10 @@ diff -Naur calamares-3.2.7/src/modules/partition/CMakeLists.txt calamares-3.2.7-
          list( APPEND _partition_defs WITH_KPMCORE4API) # kpmcore 4 with new API
      endif()
  
-diff -Naur calamares-3.2.7/src/modules/partition/core/KPMHelpers.h calamares-3.2.7-p/src/modules/partition/core/KPMHelpers.h
---- calamares-3.2.7/src/modules/partition/core/KPMHelpers.h	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/partition/core/KPMHelpers.h	2019-06-13 17:59:03.590290085 +0200
-@@ -34,7 +34,7 @@
+diff -up calamares-3.2.12/src/modules/partition/core/KPMHelpers.h.8~ calamares-3.2.12/src/modules/partition/core/KPMHelpers.h
+--- calamares-3.2.12/src/modules/partition/core/KPMHelpers.h.8~	2019-08-07 12:58:22.000000000 +0200
++++ calamares-3.2.12/src/modules/partition/core/KPMHelpers.h	2019-08-22 15:33:02.881870140 +0200
+@@ -34,7 +34,7 @@ class Partition;
  class PartitionNode;
  class PartitionRole;
  
@@ -56,10 +57,10 @@ diff -Naur calamares-3.2.7/src/modules/partition/core/KPMHelpers.h calamares-3.2
  #define KPM_PARTITION_FLAG(x) PartitionTable::Flag::x
  #define KPM_PARTITION_STATE(x) Partition::State::x
  #define KPM_PARTITION_FLAG_ESP PartitionTable::Flag::Boot
-diff -Naur calamares-3.2.7/src/modules/partition/core/PartitionCoreModule.cpp calamares-3.2.7-p/src/modules/partition/core/PartitionCoreModule.cpp
---- calamares-3.2.7/src/modules/partition/core/PartitionCoreModule.cpp	2019-04-27 20:12:03.000000000 +0200
-+++ calamares-3.2.7-p/src/modules/partition/core/PartitionCoreModule.cpp	2019-06-13 17:59:03.590290085 +0200
-@@ -857,8 +857,9 @@
+diff -up calamares-3.2.12/src/modules/partition/core/PartitionCoreModule.cpp.8~ calamares-3.2.12/src/modules/partition/core/PartitionCoreModule.cpp
+--- calamares-3.2.12/src/modules/partition/core/PartitionCoreModule.cpp.8~	2019-08-07 12:58:22.000000000 +0200
++++ calamares-3.2.12/src/modules/partition/core/PartitionCoreModule.cpp	2019-08-22 15:33:02.881870140 +0200
+@@ -857,8 +857,9 @@ PartitionCoreModule::layoutApply( Device
      {
          if ( part->mountPoint() == "/" )
          {
Not Available
benbullard79 [@T] cox.netWe seem to be having some issue.24d 23hrs
benbullard79 [@T] cox.netMistaken rejection.24d 22hrs