automatic version update by autodist [release 3.3.0-1mamba;Fri Dec 15 2023]

This commit is contained in:
Automatic Build System 2024-01-05 21:03:48 +01:00
parent db78c02b62
commit ab65920d9d
3 changed files with 35 additions and 31 deletions

View File

@ -1,11 +0,0 @@
--- calamares-3.1.11/src/modules/dracut/main.py.orig 2017-12-24 12:22:26.939346472 +0100
+++ calamares-3.1.11/src/modules/dracut/main.py 2017-12-24 12:23:37.212394612 +0100
@@ -30,7 +30,7 @@
:return:
"""
- return target_env_call(['dracut', '-f'])
+ return target_env_call(['dracut', '-f', '-H'])
def run():

View File

@ -0,0 +1,15 @@
--- calamares-3.3.0/src/modules/dracut/main.py.orig 2023-12-14 09:47:11.824021030 +0100
+++ calamares-3.3.0/src/modules/dracut/main.py 2023-12-14 09:47:27.638063004 +0100
@@ -37,10 +37,10 @@
"""
try:
initramfs_name = libcalamares.job.configuration['initramfsName']
- target_env_process_output(['dracut', '-f', initramfs_name])
+ target_env_process_output(['dracut', '-f', '-H', initramfs_name])
except KeyError:
try:
- target_env_process_output(['dracut', '-f'])
+ target_env_process_output(['dracut', '-f', '-H'])
except subprocess.CalledProcessError as cpe:
libcalamares.utils.warning(f"Dracut failed with output: {cpe.output}")
return cpe.returncode

View File

@ -1,5 +1,5 @@
Name: calamares
Version: 3.2.62
Version: 3.3.0
Release: 1mamba
Summary: Distribution-independent installer framework
Group: Graphical Desktop/Applications/Utilities
@ -12,7 +12,7 @@ Patch0: calamares-2.3-add_smart_package_manager_support.patch
Patch1: calamares-1.0.1-plymouth_path.patch
Patch2: calamares-1.1.2-displaymanager_fix_paths_openmamba.patch
Patch3: calamares-1.0.1-fix_reboot.patch
Patch4: calamares-3.1.11-dracut_hostonly.patch
Patch4: calamares-3.3.0-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
@ -26,13 +26,9 @@ Patch14: calamares-3.2.61-fix-plasma-session-x11.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libQt5Positioning-devel
BuildRequires: libQt5Svg-devel
BuildRequires: libQt5WebChannel-devel
BuildRequires: libQt5WebEngine-devel
BuildRequires: libX11-devel
BuildRequires: libappstream-qt-devel
BuildRequires: libboost-devel
BuildRequires: libgcc
BuildRequires: libicu-devel
BuildRequires: libkauth-devel
@ -56,10 +52,11 @@ BuildRequires: libkxmlgui-devel
BuildRequires: libparted-devel
BuildRequires: libplasma-framework-devel
BuildRequires: libpwquality-devel
BuildRequires: libpython310-devel
BuildRequires: libpython3-devel
BuildRequires: libsolid-devel
BuildRequires: libsonnet-devel
BuildRequires: libstdc++6-devel
BuildRequires: libxcrypt-devel
BuildRequires: libyaml-cpp-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
@ -69,9 +66,9 @@ BuildRequires: libkpmcore-devel >= 22.04.0
BuildRequires: cmake
BuildRequires: libpolkit-qt5-1-devel
BuildRequires: libboost-devel >= 1.81.0
BuildRequires: python-boost-py310 >= 1.81.0
BuildRequires: python310
BuildRequires: python-jsonschema-py310
BuildRequires: python-boost-py3 >= 1.81.0
BuildRequires: python3
BuildRequires: python-jsonschema-py3
%ifarch x86_64 %{ix86}
Requires: grub
Requires: grub-efi-x86_64
@ -80,9 +77,9 @@ Requires: libqt5-plugins
Requires: squashfs
Requires: gptfdisk
Requires: ckbcomp
Requires: python310
Requires: python-boost-py310
Requires: python-jsonschema-py310
Requires: python3
Requires: python-boost-py3
Requires: python-jsonschema-py3
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description
@ -113,9 +110,7 @@ This package contains libraries and header files for developing applications tha
#-D -T
#:<< _EOF
%patch 4 -p1
#%patch9 -p1
#%patch10 -p1
%patch 11 -p1
#%patch 11 -p1
%patch 12 -p1
%patch 13 -p1
%patch 14 -p1
@ -124,9 +119,9 @@ This package contains libraries and header files for developing applications tha
#:<< _EOF
%cmake -d build \
-DWITH_PARTITIONMANAGER=ON \
-DKI18N_PYTHON_EXECUTABLE:FILEPATH=%{__python310} \
-DKI18N_PYTHON_EXECUTABLE:FILEPATH=%{__python3} \
-DWITH_PYTHON=ON \
-DPYTHON_EXECUTABLE=%{__python310}
-DPYTHON_EXECUTABLE=%{__python3}
# PythonQt deprecated
# -DWITH_PYTHONQT=ON \
@ -268,8 +263,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%{_libdir}/calamares/modules/unpackfs/*
%dir %{_libdir}/calamares/modules/users
%{_libdir}/calamares/modules/users/*
%dir %{_libdir}/calamares/modules/webview
%{_libdir}/calamares/modules/webview/*
#%dir %{_libdir}/calamares/modules/webview
#%{_libdir}/calamares/modules/webview/*
%dir %{_libdir}/calamares/modules/welcome
%{_libdir}/calamares/modules/welcome/*
%dir %{_libdir}/calamares/modules/welcomeq
@ -298,6 +293,8 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
%{_libdir}/calamares/modules/tracking/*
%dir %{_libdir}/calamares/modules/zfs
%{_libdir}/calamares/modules/zfs/*
%dir %{_libdir}/calamares/modules/zfshostid
%{_libdir}/calamares/modules/zfshostid*
%doc AUTHORS LICENSES/*
%files -n lib%{name}-devel
@ -329,6 +326,9 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
#%doc README.md
%changelog
* Fri Dec 15 2023 Automatic Build System <autodist@mambasoft.it> 3.3.0-1mamba
- automatic version update by autodist
* Wed Apr 26 2023 Automatic Build System <autodist@mambasoft.it> 3.2.62-1mamba
- automatic version update by autodist