From 86fe9bfb9b2a83889a653f3f005182eb6a704bd2 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 21:03:41 +0100
Subject: [PATCH] fixed build with python 3.6 [release 3.2.10-2mamba;Sun Jun 30
 2019]

---
 calamares.spec | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/calamares.spec b/calamares.spec
index 9349334..edddad6 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,5 +1,5 @@
 Name:          calamares
-Version:       3.2.2
+Version:       3.2.10
 Release:       2mamba
 Summary:       Distribution-independent installer framework
 Group:         Graphical Desktop/Applications/Utilities
@@ -32,6 +32,7 @@ BuildRequires: libkcompletion-devel
 BuildRequires: libkconfig-devel
 BuildRequires: libkconfigwidgets-devel
 BuildRequires: libkcoreaddons-devel
+BuildRequires: libkcrash-devel
 BuildRequires: libki18n-devel
 BuildRequires: libkio-devel
 BuildRequires: libkjobwidgets-devel
@@ -44,6 +45,7 @@ BuildRequires: libkwidgetsaddons-devel
 BuildRequires: libkxmlgui-devel
 BuildRequires: libparted-devel
 BuildRequires: libplasma-framework-devel
+BuildRequires: libpwquality-devel
 BuildRequires: libpython36-devel
 BuildRequires: libqt5-devel
 BuildRequires: libsonnet-devel
@@ -54,6 +56,9 @@ BuildRequires: libyaml-cpp-devel
 BuildRequires: cmake
 BuildRequires: libpolkit-qt5-1-devel
 BuildRequires: libboost-devel >= 1.57.0-3mamba
+BuildRequires: libkpmcore-devel >= 4.0.0
+BuildRequires: python36
+BuildRequires: libPythonQt-devel
 %ifarch x86_64 %{ix86}
 Requires:      grub
 Requires:      grub-efi-x86_64
@@ -62,6 +67,7 @@ Requires:      libqt5-plugins
 Requires:      squashfs
 Requires:      gptfdisk
 Requires:      ckbcomp
+Requires:      python36
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -92,10 +98,14 @@ This package contains libraries and header files for developing applications tha
 %patch4 -p1
 %patch8 -p1
 
+sed -i "s|PYTHONLIBS_VERSION 3.3|PYTHONLIBS_VERSION 3.6|" CMakeLists.txt
+
 %build
 #:<< _EOF
 %cmake -d build \
-   -DWITH_PARTITIONMANAGER=ON
+   -DWITH_PARTITIONMANAGER=ON \
+   -DKI18N_PYTHON_EXECUTABLE:FILEPATH=%{__python36} \
+   -DWITH_PYTHON=ON
 
 %make
 
@@ -122,7 +132,12 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
 %dir %{_datadir}/calamares
 %dir %{_datadir}/calamares/branding
 %dir %{_datadir}/calamares/branding/default
-%{_datadir}/calamares/branding/default/*
+%{_datadir}/calamares/branding/default/branding.desc
+%{_datadir}/calamares/branding/default/languages.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
@@ -159,6 +174,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
 %{_libdir}/calamares/modules/dummypython/*
 %dir %{_libdir}/calamares/modules/finished
 %{_libdir}/calamares/modules/finished/*
+%dir %{_libdir}/calamares/modules/fsresizer
+%{_libdir}/calamares/modules/fsresizer/*
 %dir %{_libdir}/calamares/modules/fstab
 %{_libdir}/calamares/modules/fstab/*
 %dir %{_libdir}/calamares/modules/grubcfg
@@ -195,6 +212,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/oemid
+%{_libdir}/calamares/modules/oemid/*
 %dir %{_libdir}/calamares/modules/packages
 %{_libdir}/calamares/modules/packages/*
 %dir %{_libdir}/calamares/modules/partition
@@ -205,8 +224,6 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
 %{_libdir}/calamares/modules/plymouthcfg/*
 %dir %{_libdir}/calamares/modules/removeuser
 %{_libdir}/calamares/modules/removeuser/*
-#%dir %{_libdir}/calamares/modules/services
-#%{_libdir}/calamares/modules/services/*
 %dir %{_libdir}/calamares/modules/summary
 %{_libdir}/calamares/modules/summary/*
 %dir %{_libdir}/calamares/modules/umount
@@ -225,6 +242,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
 %{_libdir}/calamares/modules/openrcdmcryptcfg/*
 %dir %{_libdir}/calamares/modules/preservefiles/
 %{_libdir}/calamares/modules/preservefiles/*
+%dir %{_libdir}/calamares/modules/rawfs
+%{_libdir}/calamares/modules/rawfs/*
 %dir %{_libdir}/calamares/modules/services-openrc
 %{_libdir}/calamares/modules/services-openrc/*
 %dir %{_libdir}/calamares/modules/services-systemd
@@ -252,6 +271,12 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
 
 
 %changelog
+* Sun Jun 30 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.10-2mamba
+- fixed build with python 3.6
+
+* Sun Jun 30 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.10-1mamba
+- update to 3.2.10
+
 * Sun Sep 23 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.2-2mamba
 - rebuilt with python 3.3 patch