diff --git a/python3.spec b/python3.spec index ef9fb0f084c4264e77ad50ea6476f006ae53daad..98ef6e875910953febb1cff271e37f24fcbea9ad 100644 --- a/python3.spec +++ b/python3.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %global pybasever 3.10 # pybasever without the dot: @@ -184,7 +184,7 @@ BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: readline-devel -BuildRequires: redhat-rpm-config >= 127 +BuildRequires: system-rpm-config >= 23 BuildRequires: sqlite-devel BuildRequires: gdb @@ -286,9 +286,7 @@ Requires: %{pkgname}-libs = %{version}-%{release} # This prevents ALL subpackages built from this spec to require # /usr/bin/python3* or python(abi). Granularity per subpackage is impossible. -# It's intended for the libs package not to drag in the interpreter, see -# https://bugzilla.redhat.com/show_bug.cgi?id=1547131 -# https://bugzilla.redhat.com/show_bug.cgi?id=1862082 +# It's intended for the libs package not to drag in the interpreter. # All other packages require %%{pkgname} explicitly. %global __requires_exclude ^(/usr/bin/python3|python\\(abi\\)) @@ -348,7 +346,6 @@ Provides: bundled(python3dist(setuptools)) = %{setuptools_version} # There are files in the standard library that have python shebang. # We've filtered the automatic requirement out so libs are installable without # the main package. This however makes it pulled in by default. -# See https://bugzilla.redhat.com/show_bug.cgi?id=1547131 Recommends: %{pkgname} = %{version}-%{release} # tkinter is part of the standard library, @@ -662,7 +659,6 @@ BuildPython() { # The debug build is compiled with the lowest level of optimizations as to not optimize # out frames. We also suppress the warnings as the default distro value of the FORTIFY_SOURCE # option produces too many warnings when compiling at the O0 optimization level. -# See also: https://bugzilla.redhat.com/show_bug.cgi?id=1818857 BuildPython debug \ "--without-ensurepip --with-pydebug" \ "-O0 -Wno-cpp" @@ -691,7 +687,6 @@ topdir=$(pwd) # file, with a -gdb.py suffix. # We put them next to the debug file, because ldconfig would complain if # it found non-library files directly in /usr/lib/ -# (see https://bugzilla.redhat.com/show_bug.cgi?id=562980) # # We'll put these files in the debuginfo package by installing them to e.g.: # /usr/lib/debug/usr/lib/libpython3.2.so.1.0.debug-gdb.py @@ -769,7 +764,6 @@ cp -p Tools/scripts/pathfix.py %{buildroot}%{_bindir}/pathfix%{pybasever}.py # Install i18n tools to bindir # They are also in python2, so we version them -# https://bugzilla.redhat.com/show_bug.cgi?id=1571474 for tool in pygettext msgfmt; do cp -p Tools/i18n/${tool}.py %{buildroot}%{_bindir}/${tool}%{pybasever}.py ln -s ${tool}%{pybasever}.py %{buildroot}%{_bindir}/${tool}3.py @@ -827,7 +821,6 @@ find %{buildroot} -perm 555 -exec chmod 755 {} \; # Create "/usr/bin/python3-debug", a symlink to the python3 debug binary, to # avoid the user having to know the precise version and ABI flags. -# See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=676748 %if %{with debug_build} && %{with main_python} ln -s \ %{_bindir}/python%{LDVERSION_debug} \ @@ -879,7 +872,6 @@ done # Ensure that the curses module was linked against libncursesw.so, rather than # libncurses.so -# See https://bugzilla.redhat.com/show_bug.cgi?id=539917 ldd %{buildroot}/%{dynload_dir}/_curses*.so \ | grep curses \ | grep libncurses.so && (echo "_curses.so linked against libncurses.so" ; exit 1) @@ -1420,9 +1412,6 @@ CheckPython optimized %endif # with debug_build # We put the debug-gdb.py file inside /usr/lib/debug to avoid noise from ldconfig -# See https://bugzilla.redhat.com/show_bug.cgi?id=562980 -# -# The /usr/lib/rpm/redhat/macros defines %%__debug_package to use # debugfiles.list, and it appears that everything below /usr/lib/debug and # (/usr/src/debug) gets added to this file (via LISTFILES) in # /usr/lib/rpm/find-debuginfo.sh @@ -1432,7 +1421,6 @@ CheckPython optimized # (if it doesn't, then the rpmbuild ought to fail since the debug-gdb.py # payload file would be unpackaged) -# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1476593 %undefine _debuginfo_subpackages # ====================================================== @@ -1440,6 +1428,9 @@ CheckPython optimized # ====================================================== %changelog +* Fri Mar 17 2023 happy_orange - 3.10.10-3 +- remove the wrong buildrequires + * Sat Feb 11 2023 Funda Wang - 3.10.10-2 - Fix linkage of internal modules and external modules