rpms/calamares
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.2.24 [release 3.2.24-1mamba;Sat May 23 2020]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 21:03:42 +01:00
parent 2250c69620
commit 647f40763b
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calamares-3.2.15-skip-partition-if-minsize-less-than-available-size.patch
View File

@ -1,15 +0,0 @@
--- calamares-3.2.15/src/modules/partition/core/PartitionLayout.cpp.orig 2019-10-12 12:00:31.660000000 +0200
+++ calamares-3.2.15/src/modules/partition/core/PartitionLayout.cpp 2019-10-12 12:01:10.894000000 +0200
@@ -179,6 +179,12 @@
else
minSize = 0;
+ if ( availableSize < 5 * 1024 * 1024) {
+ cWarning() << "Partition" << part.partMountPoint << "available size"
+ << "is insufficient to add partition, skipping...";
+ continue;
+ }
+
if ( part.partMaxSize.isValid() )
maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() );
else

16
calamares-3.2.24-skip-partition-if-minsize-less-than-available-size.patch Normal file
View File

@ -0,0 +1,16 @@
diff -Nru calamares-3.2.24.orig/src/modules/partition/core/PartitionLayout.cpp calamares-3.2.24/src/modules/partition/core/PartitionLayout.cpp
--- calamares-3.2.24.orig/src/modules/partition/core/PartitionLayout.cpp 2020-05-23 12:11:51.000000000 +0200
+++ calamares-3.2.24/src/modules/partition/core/PartitionLayout.cpp 2020-05-23 12:26:41.560000000 +0200
@@ -195,6 +195,12 @@
minSize = 0;
}
+ if ( availableSize < 5 * 1024 * 1024) {
+ cWarning() << "Partition" << part.partMountPoint << "available size"
+ << "is insufficient to add partition, skipping...";
+ continue;
+ }
+
if ( part.partMaxSize.isValid() )
{
maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() );

42
calamares.spec
View File

@ -1,5 +1,5 @@
Name: calamares
Version: 3.2.17.1
Version: 3.2.24
Release: 1mamba
Summary: Distribution-independent installer framework
Group: Graphical Desktop/Applications/Utilities
@ -7,7 +7,6 @@ Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/calamares/calamares
## GITSOURCE https://github.com/calamares/calamares.git v1.0.1
Source: https://github.com/calamares/calamares.git/v%{version}/calamares-%{version}.tar.bz2
Patch0: calamares-2.3-add_smart_package_manager_support.patch
Patch1: calamares-1.0.1-plymouth_path.patch
@ -18,15 +17,15 @@ Patch5: calamares-1.0.1-locale_use_LANG.patch
Patch6: calamares-1.0.1-replace_chroot_call.patch
Patch7: calamares-1.1.2-openmamba_autopartitioning.patch
Patch8: calamares-3.2.2-python-3.3.patch
Patch9: calamares-3.2.15-skip-partition-if-minsize-less-than-available-size.patch
Patch9: calamares-3.2.24-skip-partition-if-minsize-less-than-available-size.patch
Patch10: calamares-3.2.17.1-dont-backup-dotfiles.patch
Patch11: calamares-3.2.17.1-boost-python36-link-fix.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libQt5WebEngine-devel
BuildRequires: libatasmart-devel
BuildRequires: libblkid-devel
BuildRequires: libappstream-qt-devel
BuildRequires: libboost-devel
BuildRequires: libgcc
BuildRequires: libkauth-devel
@ -45,6 +44,7 @@ BuildRequires: libkpmcore-devel
BuildRequires: libkservice-devel
BuildRequires: libktextwidgets-devel
BuildRequires: libkwidgetsaddons-devel
BuildRequires: libkwindowsystem-devel
BuildRequires: libkxmlgui-devel
BuildRequires: libparted-devel
BuildRequires: libplasma-framework-devel
@ -53,14 +53,13 @@ BuildRequires: libpython3-devel
BuildRequires: libqt5-devel
BuildRequires: libsonnet-devel
BuildRequires: libstdc++6-devel
BuildRequires: libuuid-devel
BuildRequires: libyaml-cpp-devel
## AUTOBUILDREQ-END
BuildRequires: cmake
BuildRequires: libpolkit-qt5-1-devel
BuildRequires: libboost-devel >= 1.57.0-3mamba
BuildRequires: python-boost-py36
#BuildRequires: libkpmcore-devel >= 4.0.0
BuildRequires: libkpmcore-devel >= 4.1.0
BuildRequires: python36
BuildRequires: libPythonQt-devel
%ifarch x86_64 %{ix86}
@ -101,7 +100,6 @@ This package contains libraries and header files for developing applications tha
#-D -T
#:<< _EOF
%patch4 -p1
#%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
@ -142,13 +140,10 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%dir %{_datadir}/calamares/branding
%dir %{_datadir}/calamares/branding/default
%{_datadir}/calamares/branding/default/branding.desc
%{_datadir}/calamares/branding/default/languages.png
%{_datadir}/calamares/branding/default/*.png
%{_datadir}/calamares/branding/default/show.qml
%{_datadir}/calamares/branding/default/squid.png
%{_datadir}/calamares/branding/default/stylesheet.qss
%dir %{_datadir}/calamares/branding/default/lang
#%dir %{_datadir}/calamares/modules
#%{_datadir}/calamares/modules/*.conf
%dir %{_datadir}/calamares/qml
%dir %{_datadir}/calamares/qml/calamares
%dir %{_datadir}/calamares/qml/calamares/slideshow
@ -193,6 +188,10 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%{_libdir}/calamares/modules/hostinfo/*
%dir %{_libdir}/calamares/modules/hwclock
%{_libdir}/calamares/modules/hwclock/*
%dir %{_libdir}/calamares/modules/keyboard
%{_libdir}/calamares/modules/keyboard/*
%dir %{_libdir}/calamares/modules/keyboardq
%{_libdir}/calamares/modules/keyboardq/*
%dir %{_libdir}/calamares/modules/initcpio
%{_libdir}/calamares/modules/initcpio/*
%dir %{_libdir}/calamares/modules/initcpiocfg
@ -203,18 +202,18 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%{_libdir}/calamares/modules/initramfscfg/*
%dir %{_libdir}/calamares/modules/interactiveterminal
%{_libdir}/calamares/modules/interactiveterminal/*
%dir %{_libdir}/calamares/modules/luksbootkeyfile
%{_libdir}/calamares/modules/luksbootkeyfile/*
%dir %{_libdir}/calamares/modules/luksopenswaphookcfg
%{_libdir}/calamares/modules/luksopenswaphookcfg/*
%dir %{_libdir}/calamares/modules/keyboard
%{_libdir}/calamares/modules/keyboard/*
%dir %{_libdir}/calamares/modules/license
%{_libdir}/calamares/modules/license/*
%dir %{_libdir}/calamares/modules/locale
%{_libdir}/calamares/modules/locale/*
%dir %{_libdir}/calamares/modules/localecfg
%{_libdir}/calamares/modules/localecfg/*
%dir %{_libdir}/calamares/modules/localeq
%{_libdir}/calamares/modules/localeq/*
%dir %{_libdir}/calamares/modules/luksbootkeyfile
%{_libdir}/calamares/modules/luksbootkeyfile/*
%dir %{_libdir}/calamares/modules/luksopenswaphookcfg
%{_libdir}/calamares/modules/luksopenswaphookcfg/*
%dir %{_libdir}/calamares/modules/machineid
%{_libdir}/calamares/modules/machineid/*
%dir %{_libdir}/calamares/modules/mount
@ -223,6 +222,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%{_libdir}/calamares/modules/netinstall/*
%dir %{_libdir}/calamares/modules/networkcfg
%{_libdir}/calamares/modules/networkcfg/*
%dir %{_libdir}/calamares/modules/notesqml
%{_libdir}/calamares/modules/notesqml/*
%dir %{_libdir}/calamares/modules/oemid
%{_libdir}/calamares/modules/oemid/*
%dir %{_libdir}/calamares/modules/packages
@ -247,6 +248,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%{_libdir}/calamares/modules/webview/*
%dir %{_libdir}/calamares/modules/welcome
%{_libdir}/calamares/modules/welcome/*
%dir %{_libdir}/calamares/modules/welcomeq
%{_libdir}/calamares/modules/welcomeq/*
%dir %{_libdir}/calamares/modules/contextualprocess
%{_libdir}/calamares/modules/contextualprocess/*
%dir %{_libdir}/calamares/modules/openrcdmcryptcfg
@ -281,6 +284,9 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
#%doc README.md
%changelog
* Sat May 23 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.24-1mamba
- update to 3.2.24
* Sat Dec 21 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.17.1-1mamba
- update to 3.2.17.1
- added a patch to remove making a backup of home dotfiles in case of partition reuse