From d17a7c209e1606b40c54fb8aedda4ebcc0001f55 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:03:41 +0100 Subject: [PATCH] rebuilt with python 3.3 patch [release 3.2.2-2mamba;Sun Sep 23 2018] --- calamares-3.1.11-python-3.3.patch | 11 -------- calamares-3.2.2-python-3.3.patch | 11 ++++++++ calamares.spec | 44 ++++++++++++++++++++++++------- 3 files changed, 45 insertions(+), 21 deletions(-) delete mode 100644 calamares-3.1.11-python-3.3.patch create mode 100644 calamares-3.2.2-python-3.3.patch diff --git a/calamares-3.1.11-python-3.3.patch b/calamares-3.1.11-python-3.3.patch deleted file mode 100644 index 9101953..0000000 --- a/calamares-3.1.11-python-3.3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- calamares-3.1.11/CMakeLists.txt.orig 2018-01-01 02:00:41.654943238 +0100 -+++ calamares-3.1.11/CMakeLists.txt 2018-01-01 01:59:38.849762152 +0100 -@@ -133,7 +133,7 @@ - enable_testing() - endif () - --find_package( PythonLibs 3.3 ) -+find_package( PythonLibs 3.3 EXACT REQUIRED ) - set_package_properties( - PythonLibs PROPERTIES - DESCRIPTION "C interface libraries for the Python 3 interpreter." diff --git a/calamares-3.2.2-python-3.3.patch b/calamares-3.2.2-python-3.3.patch new file mode 100644 index 0000000..85944ab --- /dev/null +++ b/calamares-3.2.2-python-3.3.patch @@ -0,0 +1,11 @@ +--- calamares-3.2.2/CMakeLists.txt.orig 2018-09-23 15:08:02.457509790 +0200 ++++ calamares-3.2.2/CMakeLists.txt 2018-09-23 15:08:10.307540896 +0200 +@@ -248,7 +248,7 @@ + enable_testing() + endif () + +-find_package( PythonLibs ${PYTHONLIBS_VERSION} ) ++find_package( PythonLibs ${PYTHONLIBS_VERSION} EXACT REQUIRED ) + set_package_properties( + PythonLibs PROPERTIES + DESCRIPTION "C interface libraries for the Python 3 interpreter." diff --git a/calamares.spec b/calamares.spec index 871de69..9349334 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,6 +1,6 @@ Name: calamares -Version: 3.1.11 -Release: 3mamba +Version: 3.2.2 +Release: 2mamba Summary: Distribution-independent installer framework Group: Graphical Desktop/Applications/Utilities Vendor: openmamba @@ -17,7 +17,7 @@ Patch4: calamares-3.1.11-dracut_hostonly.patch 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.1.11-python-3.3.patch +Patch8: calamares-3.2.2-python-3.3.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -87,10 +87,13 @@ This package contains libraries and header files for developing applications tha %prep %setup -q +#-D -T +#:<< _EOF %patch4 -p1 %patch8 -p1 %build +#:<< _EOF %cmake -d build \ -DWITH_PARTITIONMANAGER=ON @@ -120,13 +123,13 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps %dir %{_datadir}/calamares/branding %dir %{_datadir}/calamares/branding/default %{_datadir}/calamares/branding/default/* -%dir %{_datadir}/calamares/modules -%{_datadir}/calamares/modules/*.conf +#%dir %{_datadir}/calamares/modules +#%{_datadir}/calamares/modules/*.conf %dir %{_datadir}/calamares/qml %dir %{_datadir}/calamares/qml/calamares %dir %{_datadir}/calamares/qml/calamares/slideshow %{_datadir}/calamares/qml/calamares/slideshow/* -%{_datadir}/calamares/settings.conf +#%{_datadir}/calamares/settings.conf %{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy %{_mandir}/man8/calamares.8* @@ -148,8 +151,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps %{_libdir}/calamares/modules/dracutlukscfg/* %dir %{_libdir}/calamares/modules/dummycpp %{_libdir}/calamares/modules/dummycpp/* -%dir %{_libdir}/calamares/modules/dummypythonqt -%{_libdir}/calamares/modules/dummypythonqt/* +#%dir %{_libdir}/calamares/modules/dummypythonqt +#%{_libdir}/calamares/modules/dummypythonqt/* %dir %{_libdir}/calamares/modules/dummyprocess %{_libdir}/calamares/modules/dummyprocess/* %dir %{_libdir}/calamares/modules/dummypython @@ -202,8 +205,8 @@ 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/services +#%{_libdir}/calamares/modules/services/* %dir %{_libdir}/calamares/modules/summary %{_libdir}/calamares/modules/summary/* %dir %{_libdir}/calamares/modules/umount @@ -216,6 +219,20 @@ 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/contextualprocess +%{_libdir}/calamares/modules/contextualprocess/* +%dir %{_libdir}/calamares/modules/openrcdmcryptcfg +%{_libdir}/calamares/modules/openrcdmcryptcfg/* +%dir %{_libdir}/calamares/modules/preservefiles/ +%{_libdir}/calamares/modules/preservefiles/* +%dir %{_libdir}/calamares/modules/services-openrc +%{_libdir}/calamares/modules/services-openrc/* +%dir %{_libdir}/calamares/modules/services-systemd +%{_libdir}/calamares/modules/services-systemd/* +%dir %{_libdir}/calamares/modules/shellprocess +%{_libdir}/calamares/modules/shellprocess/* +%dir %{_libdir}/calamares/modules/tracking +%{_libdir}/calamares/modules/tracking/* %doc AUTHORS LICENSE %files -n lib%{name}-devel @@ -228,12 +245,19 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps %{_includedir}/libcalamares/utils/*.h %dir %{_libdir}/cmake/Calamares %{_libdir}/cmake/Calamares/Calamares*.cmake +%{_libdir}/cmake/Calamares/CMakeColors.cmake %{_libdir}/libcalamares.so %{_libdir}/libcalamaresui.so #%doc README.md %changelog +* Sun Sep 23 2018 Silvan Calarco 3.2.2-2mamba +- rebuilt with python 3.3 patch + +* Sun Sep 23 2018 Silvan Calarco 3.2.2-1mamba +- update to 3.2.2 + * Mon Jan 01 2018 Silvan Calarco 3.1.11-3mamba - added patch to use pythonlib 3.3 instead of python binary to run python scripts