python3-3.11.0-1

p/python3/python3-vl.spec

@@ -1,27 +1,53 @@
 %bcond_with run_test
+%bcond_without rpmwheels
+%bcond_without flat
 
 %define config_htmldir /var/www/html/python
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
-Version: 3.8.12
+Version: 3.11.0
 Release: 1%{?_dist_release}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: Python
-URL: http://www.python.org/download/releases/%{version}
+URL: https://www.python.org/
 
+%define shortver %(echo %{version} | sed -e 's/~//')
 %define majorver %(echo %{version} | cut -d . -f 1)
 %define libvers %(echo %{version} | cut -d . -f 1-2)
 %define binsuffix %{libvers}
-%define python_lib %{_libdir}/python%{libvers}
+%ifarch x86_64
+%define python3_purelib %{_prefix}/lib/python%{majorver}
+%define python3_platlib %{_libdir}/python%{libvers}
+%else
+%define python3_purelib %{_libdir}/python%{majorver}
+%define python3_platlib %{_libdir}/python%{libvers}
+%endif
 %global py_SOVERSION 1.0
 %global py_INSTSONAME libpython%{libvers}.so.%{py_SOVERSION}
+%global python_wheel_dir %{_datadir}/python3-wheels
+
+Provides: python(abi) = 3
+
+# The following versions of setuptools/pip are bundled when this patch is not applied.
+# The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
+# When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
+# In such cases, the patch needs to be amended and the versions updated here:
+%global pip_version 22.3
+%global setuptools_version 65.5.0
+
+#Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
+#Source1: https://www.python.org/ftp/python/doc/%{version}/python-%{version}-docs-html.tar.bz2
+Source0: https://www.python.org/ftp/python/%{shortver}/Python-%{shortver}.tar.xz
+Source1: https://www.python.org/ftp/python/doc/%{shortver}/python-%{shortver}-docs-html.tar.bz2
+# Desktop menu entry for idle3
+Source10: idle3.desktop
+# AppData file for idle3
+Source11: idle3.appdata.xml
 
-Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-Source1: https://docs.python.org/ftp/python/doc/%{version}/python-%{version}-docs-html.tar.bz2
 # (Patches taken from github.com/fedora-python/cpython)
 
 # 00001 # d06a8853cf4bae9e115f45e1d531d2dc152c5cc8
@@ -29,51 +55,28 @@ Source1: https://docs.python.org/ftp/python/doc/%{version}/python-%{version}-doc
 # Was Patch0 in ivazquez' python3000 specfile
 Patch1: 00001-rpath.patch
 
-# 00102 # ec4353c0f646eb567cc0d63e1e41eb5e29cc3e81
-# Change the various install paths to use /usr/lib64/ instead or /usr/lib/
-#
-# Only used when "%%{_lib}" == "lib64".
-Patch102: 00102-lib64.patch
-
-# 00111 # 03918d404a40a50c9f5f93dc748b52e613d70d31
-# Don't try to build a libpythonMAJOR.MINOR.a
-#
-# Downstream only: not appropriate for upstream.
-#
-# See https://bugzilla.redhat.com/show_bug.cgi?id=556092
-Patch111: 00111-no-static-lib.patch
-
-# 00189 # adf51ed04ac74fd6fc39c642af35b87680c71dab
-# Instead of bundled wheels, use our RPM packaged wheels
-#
-# We keep them in /usr/share/python-wheels
-#
-# Downstream only: upstream bundles
-# We might eventually pursuit upstream support, but it's low prio
-Patch189: 00189-use-rpm-wheels.patch
-# The following versions of setuptools/pip are bundled when this patch is not applied.
-# The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
-# When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
-# In such cases, the patch needs to be amended and the versions updated here:
-%global pip_version 20.1.1
-%global setuptools_version 47.1.0
-
-# 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356
+# 00251 # af0f1ba72e01cb93371ff21fb7ca889daa43fa7a
 # Change user install location
 #
+# Set values of base and platbase in sysconfig from /usr
+# to /usr/local when RPM build is not detected
+# to make pip and similar tools install into separate location.
+#
 # Set values of prefix and exec_prefix in distutils install command
 # to /usr/local if executable is /usr/bin/python* and RPM build
-# is not detected to make pip and distutils install into separate location.
+# is not detected to make distutils and pypa/distutils install into separate location.
 #
 # Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
-# Downstream only: Awaiting resources to work on upstream PEP
+# Downstream only.
+#
+# We've tried to rework in Fedora 36/Python 3.10 to follow https://bugs.python.org/issue43976
+# but we have identified serious problems with that approach,
+# see https://bugzilla.redhat.com/2026979 or https://bugzilla.redhat.com/2097183
+#
+# pypa/distutils integration: https://github.com/pypa/distutils/pull/70
 Patch251: 00251-change-user-install-location.patch
 
-# 00274 # 1e9258f6e8f70e86d5130113d3eed22993cf3da9
-# Upstream uses Debian-style architecture naming, change to match Fedora
-Patch274: 00274-fix-arch-names.patch
-
-# 00328 # 367fdcb5a075f083aea83ac174999272a8faf75c
+# 00328 # 318e500c98f5e59eb1f23e0fcd32db69b9bd17e1
 # Restore pyc to TIMESTAMP invalidation mode as default in rpmbuild
 #
 # Since Fedora 31, the $SOURCE_DATE_EPOCH is set in rpmbuild to the latest
@@ -87,13 +90,28 @@ Patch274: 00274-fix-arch-names.patch
 # Ideally, we should talk to upstream and explain why we don't want this
 Patch328: 00328-pyc-timestamp-invalidation-mode.patch
 
+# 00371 # c1754d9c2750f89cb702e1b63a99201f5f7cff00
+# Revert "bpo-1596321: Fix threading._shutdown() for the main thread (GH-28549) (GH-28589)"
+#
+# This reverts commit 38c67738c64304928c68d5c2bd78bbb01d979b94. It
+# introduced regression causing FreeIPA's tests to fail.
+#
+# For more info see:
+# https://bodhi.fedoraproject.org/updates/FEDORA-2021-e152ce5f31
+# https://github.com/GrahamDumpleton/mod_wsgi/issues/730
+Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch
+
 # security
 # (none)
 
+# vine
+Patch10000: python3-flatten.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
+BuildRequires: desktop-file-utils
 BuildRequires: findutils
 BuildRequires: gcc-c++
 BuildRequires: gdbm-devel
@@ -142,6 +160,30 @@ python package will also need to be installed.  You'll probably also
 want to install the python-docs package, which contains Python
 documentation.
 
+
+%package idle
+Summary: A basic graphical development environment for Python
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-tkinter = %{version}-%{release}
+Provides: idle3 = %{version}-%{release}
+Provides: idle = %{version}-%{release}
+Provides: python3-tools = %{version}-%{release}
+Provides: python3-tools%{?_isa} = %{version}-%{release}
+Obsoletes: python3-tools < 3.10.0
+
+%description idle
+IDLE is Python’s Integrated Development and Learning Environment.
+
+IDLE has the following features: Python shell window (interactive
+interpreter) with colorizing of code input, output, and error messages;
+multi-window text editor with multiple undo, Python colorizing,
+smart indent, call tips, auto completion, and other features;
+search within any window, replace within editor windows, and
+search through multiple files (grep); debugger with persistent
+breakpoints, stepping, and viewing of global and local namespaces;
+configuration, browsers, and other dialogs.
+
+
 %package tkinter
 Summary: A graphical user interface for the Python scripting language.
 Group: programming
@@ -159,17 +201,6 @@ You should install the tkinter package if you'd like to use a graphical
 user interface for Python programming.
 
 
-%package tools
-Summary: A collection of development tools included with Python.
-Group: programming
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-tkinter = %{version}
-
-%description tools
-The Python package includes several development tools that are used
-to build python programs.
-
-
 %package docs
 Summary: Documentation for the Python programming language.
 Summary(ja): Python プログラミング言語のドキュメント
@@ -188,7 +219,17 @@ for the Python language.
 
 
 %prep
-%setup -q -n Python-%{version}
+%setup -n Python-%{shortver}
+%autopatch -p1 -M 9999
+%if %{with flat}
+%patch10000 -p1
+%endif
+
+%if %{with rpmwheels}
+rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
+rm Lib/ensurepip/_bundled/setuptools-%{setuptools_version}-py3-none-any.whl
+%endif
+
 # Remove all exe files to ensure we are not shipping prebuilt binaries
 # note that those are only used to create Microsoft Windows installers
 # and that functionality is broken on Linux anyway
@@ -197,28 +238,6 @@ find -name '*.exe' -print -delete
 # Remove bundled libraries to ensure that we're using the system copy.
 rm -r Modules/expat
 
-#
-# Apply patches:
-#
-%patch1 -p1
-
-%if "%{_lib}" == "lib64"
-%patch102 -p1
-%endif
-%patch111 -p1
-
-%if %{with rpmwheels}
-%patch189 -p1
-rm Lib/ensurepip/_bundled/*.whl
-%endif
-
-%patch251 -p1
-%patch274 -p1
-%patch328 -p1
-
-# security
-# (none)
-
 # Remove files that should be generated by the build
 # (This is after patching, so that we can use patches directly from upstream)
 rm configure pyconfig.h.in
@@ -229,6 +248,13 @@ autoheader
 
 
 %build
+
+# The build process embeds version info extracted from the Git repository
+# into the Py_GetBuildInfo and sys.version strings.
+# Our Git repository is artificial, so we don't want that.
+# Tell configure to not use git.
+export HAS_GIT=not-found
+
 export CFLAGS="%{?extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
 export CFLAGS_NODIST="%{?build_cflags} -D_GNU_SOURCE -fPIC -fwrapv%{?with_no_semantic_interposition: -fno-semantic-interposition}"
 export CXXFLAGS="%{?extension_cxxflags} -D_GNU_SOURCE -fPIC -fwrapv"
@@ -238,10 +264,10 @@ export LINKCC="gcc"
 export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)"
 export LDFLAGS="%{?extension_ldflags} -g $(pkg-config --libs-only-L openssl)"
 export LDFLAGS_NODIST="%{?build_ldflags}%{?with_no_semantic_interposition: -fno-semantic-interposition} -g $(pkg-config --libs-only-L openssl)"
+export PYTHON=%{__python3}
 
-./configure \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
+%configure \
+	--with-platlibdir=%{_lib} \
 	--enable-ipv6 \
 	--enable-shared \
 	--with-computed-gotos=yes \
@@ -251,19 +277,30 @@ export LDFLAGS_NODIST="%{?build_ldflags}%{?with_no_semantic_interposition: -fno-
 	--enable-loadable-sqlite-extensions \
 	--with-lto \
 	--with-ssl-default-suites=openssl \
+	--without-static-libpython \
+%if %{with rpmwheels}
+	--with-wheel-pkg-dir=%{python_wheel_dir} \
+%endif
 	--with-valgrind \
 	--without-ensurepip \
 	--enable-optimizations \
 	%{nil}
 
-make %{?_smp_mflags} CFLAGS_NODIST="$CFLAGS_NODIST" \
-	regen-all PYTHON_FOR_REGEN="python%{binsuffix}"
+%global flags_override CFLAGS_NODIST="$CFLAGS_NODIST"
 
-make %{?_smp_mflags} CFLAGS_NODIST="$CFLAGS_NODIST"
+#make %{?_smp_mflags} %{flags_override} regen-all PYTHON_FOR_REGEN="python3"
+
+make %{?_smp_mflags} %{flags_override}
 
 
 %install
 [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{python3_platlib}/site-packages
+mkdir -p %{buildroot}%{python3_purelib}/site-packages
+%if 0
+ln -sf python%{majorver} %{buildroot}%{_prefix}/lib/python%{binsuffix}
+%endif
+
 make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
 
 # replace path in pydoc
@@ -282,11 +319,11 @@ fi
 #  Tools
 echo '#!%{_bindir}/env python%{binsuffix}' > ${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
 echo 'import os, sys' >> ${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
-echo 'os.execvp("%{_bindir}/python%{binsuffix}", ["%{_bindir}/python%{binsuffix}", "%{python_lib}/idlelib/idle.py"] + sys.argv[1:])' >> ${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
+echo 'os.execvp("%{_bindir}/python%{binsuffix}", ["%{_bindir}/python%{binsuffix}", "%{python3_platlib}/idlelib/idle.py"] + sys.argv[1:])' >> ${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
 echo 'print "Failed to exec Idle"' >> ${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
 echo 'sys.exit(1)' >> ${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
-#cp -a Tools $RPM_BUILD_ROOT%{python_lib}
+#cp -a Tools $RPM_BUILD_ROOT%{python3_platlib}
 mkdir -p %{buildroot}%{_prefix}/lib/debug%{_libdir}
 cp -f Tools/gdb/libpython.py %{buildroot}%{_prefix}/lib/debug%{_libdir}/%{py_INSTSONAME}-%{version}-%{release}.%{_arch}.debug-gdb.py
 
@@ -324,8 +361,8 @@ find %{buildroot} -name \*.py \
 
 # make file lists
 rm -f mainpkg.files
-find "$RPM_BUILD_ROOT"%{python_lib} -type f |
-	sed "s|^${RPM_BUILD_ROOT}|/|" |
+find %{buildroot}%{python3_platlib} -type f |
+	sed "s|^%{buildroot}|/|" |
 	grep -v \
 		-e '/python%{libvers}/config$' \
 		-e '_tkinter.so$' \
@@ -336,36 +373,36 @@ find "$RPM_BUILD_ROOT"%{python_lib} -type f |
 		>> mainpkg.files
 
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/2to3
-find "$RPM_BUILD_ROOT""%{_prefix}"/bin -type f -o -type l |
-	sed "s|^${RPM_BUILD_ROOT}|/|" |
+find %{buildroot}%{_prefix}/bin -type f -o -type l |
+	sed "s|^%{buildroot}|/|" |
 	grep -v \
 		-e '/idlelib/' \
 		-e '/bin/2to3-%{binsuffix}$' \
 		-e '/bin/msgfmt%{binsuffix}.py' \
 		-e '/bin/pathfix%{binsuffix}.py' \
 		-e '/bin/pygettext%{binsuffix}.py' \
-		-e '/bin/pydoc%{binsuffix}$' \
-		-e '/bin/pydoc%{majorver}$' \
 		-e '/bin/idle%{binsuffix}$' \
 		-e '/bin/idle%{majorver}$' \
 		>> mainpkg.files
 
-rm -f tools.files
-find "$RPM_BUILD_ROOT"%{python_lib}/idlelib \
-      -type f |
-      sed "s|^${RPM_BUILD_ROOT}|/|" > tools.files
-echo %{_bindir}/pydoc%{binsuffix} >> tools.files
-echo %{_bindir}/pydoc%{majorver} >> tools.files
-echo %{_bindir}/idle%{binsuffix} >> tools.files
-echo %{_bindir}/idle%{majorver} >> tools.files
-
 # docs
-mkdir -p "$RPM_BUILD_ROOT"%{config_htmldir}
+mkdir -p %{buildroot}%{config_htmldir}
 (
-   cd "$RPM_BUILD_ROOT"%{config_htmldir}
+   cd %{buildroot}%{config_htmldir}
    bunzip2 < %{SOURCE1} | tar x
 )
 
+# add idle3 to menu
+install -D -m 0644 Lib/idlelib/Icons/idle_16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/idle3.png
+install -D -m 0644 Lib/idlelib/Icons/idle_32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/idle3.png
+install -D -m 0644 Lib/idlelib/Icons/idle_48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/idle3.png
+install -D -m 0644 Lib/idlelib/Icons/idle_256.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/idle3.png
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10}
+
+# Install and validate appdata file
+mkdir -p %{buildroot}%{_datadir}/metainfo
+cp -a %{SOURCE11} %{buildroot}%{_datadir}/metainfo
+
 
 %if %{with run_test}
 %check
@@ -376,19 +413,25 @@ make test
 %clean
 rm -fr $RPM_BUILD_ROOT
 
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ifarch x86_64
+%pre
+if [ ! -e %{_prefix}/lib/python%{libvers} ]; then
+  ln -sf python%{majorver} %{_prefix}/lib/python%{libvers}
+fi
+%endif
 
 
 %files -f mainpkg.files
 %defattr(-, root, root)
 %license LICENSE
 %doc Misc/ACKS Misc/HISTORY Misc/NEWS Misc/Porting Misc/README
-%attr(755,root,root) %dir %{python_lib}/
 %{_libdir}/libpython*
 %{_mandir}/man1/python%{libvers}.1*
 %{_mandir}/man1/%{name}.1*
+%attr(755,root,root) %dir %{python3_platlib}
+%attr(755,root,root) %dir %{python3_platlib}/site-packages
+%attr(755,root,root) %dir %{python3_purelib}
+%attr(755,root,root) %dir %{python3_purelib}/site-packages
 
 %files devel
 %defattr(-,root,root)
@@ -405,15 +448,19 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 %{_prefix}/lib/debug%{_libdir}/*.py
 
-%files -f tools.files tools
-%defattr(-,root,root)
+%files idle
+%{_bindir}/idle*
+%{python3_platlib}/idlelib
+%{_datadir}/metainfo/idle3.appdata.xml
+%{_datadir}/applications/idle3.desktop
+%{_datadir}/icons/hicolor/*/apps/idle3.*
 
 %files tkinter
 %defattr(-,root,root)
-%{python_lib}/__pycache__/turtle.*
-%{python_lib}/tkinter
-%{python_lib}/turtledemo
-%{python_lib}/lib-dynload/_tkinter.*.so*
+%{python3_platlib}/__pycache__/turtle.*
+%{python3_platlib}/tkinter
+%{python3_platlib}/turtledemo
+%{python3_platlib}/lib-dynload/_tkinter.*.so*
 
 %files docs
 %defattr(-,root,root)
@@ -421,6 +468,17 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.0-1
+- rebuilt.
+
+* Fri Oct 28 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.0-0
+- new upstream release.
+
+* Tue Oct 25 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.0~rc2-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- flatten noarch modules.
+
 * Tue Jan 25 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.12-1
 - new upstream release.