rebuilt with updated skip-partition-if-minsize-less-than-available-size and fix for python 3.7 [release 3.2.32.1-2mamba;Sat Nov 07 2020]
This commit is contained in:
parent
647f40763b
commit
698c8fb509
@ -1,16 +0,0 @@
|
||||
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() );
|
||||
@ -4,7 +4,7 @@
|
||||
Qt5::Core
|
||||
KF5::CoreAddons
|
||||
${OPTIONAL_PUBLIC_LIBRARIES}
|
||||
+ boost_python36
|
||||
+ boost_python3
|
||||
)
|
||||
|
||||
install( TARGETS calamares
|
||||
@ -0,0 +1,15 @@
|
||||
--- calamares-3.2.32.1/src/modules/partition/core/PartitionLayout.cpp.orig 2020-11-07 18:42:24.546000000 +0100
|
||||
+++ calamares-3.2.32.1/src/modules/partition/core/PartitionLayout.cpp 2020-11-07 18:54:28.790000000 +0100
|
||||
@@ -283,6 +283,12 @@
|
||||
size = availableSize;
|
||||
}
|
||||
|
||||
+ if ( availableSize < 5 * 1024 * 1024) {
|
||||
+ cWarning() << "Partition" << part.partMountPoint << "available size"
|
||||
+ << "is insufficient to add partition, skipping...";
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
end = firstSector + std::max( size - 1, Q_INT64_C( 0 ) );
|
||||
|
||||
if ( luksPassphrase.isEmpty() )
|
||||
@ -1,6 +1,6 @@
|
||||
Name: calamares
|
||||
Version: 3.2.24
|
||||
Release: 1mamba
|
||||
Version: 3.2.32.1
|
||||
Release: 2mamba
|
||||
Summary: Distribution-independent installer framework
|
||||
Group: Graphical Desktop/Applications/Utilities
|
||||
Vendor: openmamba
|
||||
@ -17,9 +17,9 @@ 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.24-skip-partition-if-minsize-less-than-available-size.patch
|
||||
Patch9: calamares-3.2.32.1-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
|
||||
Patch11: calamares-3.2.32.1-boost-python36-link-fix.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -49,7 +49,7 @@ BuildRequires: libkxmlgui-devel
|
||||
BuildRequires: libparted-devel
|
||||
BuildRequires: libplasma-framework-devel
|
||||
BuildRequires: libpwquality-devel
|
||||
BuildRequires: libpython3-devel
|
||||
BuildRequires: libpython33
|
||||
BuildRequires: libqt5-devel
|
||||
BuildRequires: libsonnet-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
@ -58,9 +58,10 @@ BuildRequires: libyaml-cpp-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libpolkit-qt5-1-devel
|
||||
BuildRequires: libboost-devel >= 1.57.0-3mamba
|
||||
BuildRequires: python-boost-py36
|
||||
BuildRequires: libkpmcore-devel >= 4.1.0
|
||||
BuildRequires: python36
|
||||
BuildRequires: python-boost-py3
|
||||
BuildRequires: libkpmcore-devel >= 4.2.0
|
||||
BuildRequires: python3
|
||||
BuildRequires: python-jsonschema
|
||||
BuildRequires: libPythonQt-devel
|
||||
%ifarch x86_64 %{ix86}
|
||||
Requires: grub
|
||||
@ -70,8 +71,9 @@ Requires: libqt5-plugins
|
||||
Requires: squashfs
|
||||
Requires: gptfdisk
|
||||
Requires: ckbcomp
|
||||
Requires: python36
|
||||
Requires: python-boost-py36
|
||||
Requires: python3
|
||||
Requires: python-boost-py3
|
||||
Requires: python-jsonschema
|
||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
@ -101,18 +103,19 @@ This package contains libraries and header files for developing applications tha
|
||||
#:<< _EOF
|
||||
%patch4 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
#%patch10 -p1
|
||||
%patch11 -p1
|
||||
|
||||
#sed -i "s|PYTHONLIBS_VERSION 3.3|PYTHONLIBS_VERSION 3.6|" CMakeLists.txt
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
%cmake -d build \
|
||||
-DWITH_PARTITIONMANAGER=ON \
|
||||
-DKI18N_PYTHON_EXECUTABLE:FILEPATH=%{__python36} \
|
||||
-DKI18N_PYTHON_EXECUTABLE:FILEPATH=%{__python3} \
|
||||
-DWITH_PYTHON=ON \
|
||||
-DWITH_PYTHONQT=ON
|
||||
-DPYTHON_EXECUTABLE=%{__python3}
|
||||
|
||||
# PythonQt deprecated
|
||||
# -DWITH_PYTHONQT=ON \
|
||||
|
||||
%make
|
||||
|
||||
@ -143,6 +146,7 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
|
||||
%{_datadir}/calamares/branding/default/*.png
|
||||
%{_datadir}/calamares/branding/default/show.qml
|
||||
%{_datadir}/calamares/branding/default/stylesheet.qss
|
||||
%{_datadir}/calamares/branding/default/*.license
|
||||
%dir %{_datadir}/calamares/branding/default/lang
|
||||
%dir %{_datadir}/calamares/qml
|
||||
%dir %{_datadir}/calamares/qml/calamares
|
||||
@ -252,6 +256,10 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
|
||||
%{_libdir}/calamares/modules/welcomeq/*
|
||||
%dir %{_libdir}/calamares/modules/contextualprocess
|
||||
%{_libdir}/calamares/modules/contextualprocess/*
|
||||
%dir %{_libdir}/calamares/modules/mkinitfs
|
||||
%{_libdir}/calamares/modules/mkinitfs/*
|
||||
%dir %{_libdir}/calamares/modules/usersq
|
||||
%{_libdir}/calamares/modules/usersq/*
|
||||
%dir %{_libdir}/calamares/modules/openrcdmcryptcfg
|
||||
%{_libdir}/calamares/modules/openrcdmcryptcfg/*
|
||||
%dir %{_libdir}/calamares/modules/packagechooser
|
||||
@ -268,22 +276,43 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
|
||||
%{_libdir}/calamares/modules/shellprocess/*
|
||||
%dir %{_libdir}/calamares/modules/tracking
|
||||
%{_libdir}/calamares/modules/tracking/*
|
||||
%doc AUTHORS LICENSE
|
||||
%doc AUTHORS LICENSES/*
|
||||
|
||||
%files -n lib%{name}-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/libcalamares
|
||||
%{_includedir}/libcalamares/*.h
|
||||
%dir %{_includedir}/libcalamares/geoip
|
||||
%{_includedir}/libcalamares/geoip/*.h
|
||||
%dir %{_includedir}/libcalamares/locale
|
||||
%{_includedir}/libcalamares/locale/*.h
|
||||
%dir %{_includedir}/libcalamares/modulesystem
|
||||
%{_includedir}/libcalamares/modulesystem/*.h
|
||||
%dir %{_includedir}/libcalamares/network
|
||||
%{_includedir}/libcalamares/network/*.h
|
||||
%dir %{_includedir}/libcalamares/partition
|
||||
%{_includedir}/libcalamares/partition/*.h
|
||||
%dir %{_includedir}/libcalamares/utils
|
||||
%{_includedir}/libcalamares/utils/*.h
|
||||
%dir %{_includedir}/libcalamares/viewpages
|
||||
%{_includedir}/libcalamares/viewpages/*.h
|
||||
%dir %{_includedir}/libcalamares/widgets
|
||||
%{_includedir}/libcalamares/widgets/*.h
|
||||
%dir %{_libdir}/cmake/Calamares
|
||||
%{_libdir}/cmake/Calamares/Calamares*.cmake
|
||||
%{_libdir}/cmake/Calamares/CMakeColors.cmake
|
||||
%{_libdir}/cmake/Calamares/FindYAMLCPP.cmake
|
||||
%{_libdir}/libcalamares.so
|
||||
%{_libdir}/libcalamaresui.so
|
||||
#%doc README.md
|
||||
|
||||
%changelog
|
||||
* Sat Nov 07 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.32.1-2mamba
|
||||
- rebuilt with updated skip-partition-if-minsize-less-than-available-size and fix for python 3.7
|
||||
|
||||
* Sat Nov 07 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.32.1-1mamba
|
||||
- update to 3.2.32.1
|
||||
|
||||
* Sat May 23 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.24-1mamba
|
||||
- update to 3.2.24
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user