diff --git a/python3.13.spec b/python3.13.spec index cd7a33c..c9ff579 100644 --- a/python3.13.spec +++ b/python3.13.spec @@ -132,12 +132,6 @@ Provides: bundled(python3dist(packaging)) = 24 %global jit_flag --enable-experimental-jit=yes-off %endif -# Support for the GDB debugger -%bcond gdb_hooks 1 - -# The dbm.gnu module (key-value database) -%bcond gdbm 1 - # Main interpreter loop optimization %bcond computed_gotos 1 @@ -262,6 +256,7 @@ BuildRequires: bzip2-devel BuildRequires: expat-devel >= 2.6 BuildRequires: findutils BuildRequires: gcc +BuildRequires: gdbm-devel BuildRequires: git-core BuildRequires: glibc-devel BuildRequires: gnupg2 @@ -304,10 +299,6 @@ BuildRequires: llvm(major) = 18 BuildRequires: valgrind-devel %endif -%if %{with gdbm} -BuildRequires: gdbm-devel -%endif - %if %{with main_python} BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -962,10 +953,8 @@ topdir=$(pwd) # See https://fedoraproject.org/wiki/Features/EasierPythonDebugging for more # information -%if %{with gdb_hooks} DirHoldingGdbPy=%{_usr}/lib/debug/%{_libdir} mkdir -p %{buildroot}$DirHoldingGdbPy -%endif # with gdb_hooks # When the actual %%{dynload_dir} exists (it does when python3.X is installed for regen-all) # %%{buildroot}%%{dynload_dir} is not created by make install and the extension modules are missing @@ -1002,11 +991,9 @@ InstallPython() { popd -%if %{with gdb_hooks} # See comment on $DirHoldingGdbPy above PathOfGdbPy=$DirHoldingGdbPy/$PyInstSoName-%{version}-%{release}.%{_arch}.debug-gdb.py cp Tools/gdb/libpython.py %{buildroot}$PathOfGdbPy -%endif # with gdb_hooks # Rename the -devel script that differs on different arches to arch specific name mv %{buildroot}%{_bindir}/python${LDVersion}-{,`uname -m`-}config @@ -1113,7 +1100,7 @@ LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \ -i "%{_bindir}/python%{pybasever}" -pn \ %{buildroot} \ %{buildroot}%{_bindir}/*%{pybasever}.py \ - %{?with_gdb_hooks:%{buildroot}$DirHoldingGdbPy/*.py} + %{buildroot}$DirHoldingGdbPy/*.py # Remove shebang lines from .py files that aren't executable, and # remove executability from .py files that don't have a shebang line: @@ -1423,9 +1410,7 @@ CheckPython freethreading %{1}/_curses_panel.%{2}.so\ %{1}/_datetime.%{2}.so\ %{1}/_dbm.%{2}.so\ -%if %{with gdbm}\ %{1}/_gdbm.%{2}.so\ -%endif\ %{1}/_decimal.%{2}.so\ %{1}/_elementtree.%{2}.so\ %{1}/_hashlib.%{2}.so\