X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=python3.spec;h=6cac67094cb772b28605ce90e6d2182297f11298;hb=6eede82beeb3c8ddbf5e91fd3ba8a8e9cf237222;hp=a18324b36de5c5c3ee38932cc1691fb9bc4e76fc;hpb=306c0f2dd79fa47b5add914545aa1f5ee00cfe3a;p=packages%2Fpython3.git

diff --git a/python3.spec b/python3.spec
index a18324b..6cac670 100644
--- a/python3.spec
+++ b/python3.spec
@@ -1,3 +1,10 @@
+#
+# TODO:
+# - decide what to do with __pycache__:
+#   1) package *.py sources in main and use __pycache__ dirs (and package them)
+#   2) don't package __pycache__, manually invoke py_compileall everywhere (i.e. stick to python2-way)
+# - fix tests
+# - check unpackaged files
 
 # Conditional build:
 %bcond_with	info			# info pages (requires emacs)
@@ -10,14 +17,13 @@
 # tests which may fail because of builder environment limitations (no /proc or /dev/pts)
 %define		nobuilder_tests test_resource test_openpty test_socket test_nis test_posix test_locale test_pty
 # tests which fail because of some unknown/unresolved reason (this list should be empty)
-%define		broken_tests test_httpservers
-
-%define	beta		%{nil}
+%define		broken_tests test_httpservers test_distutils test_cmd_line test_pydoc test_telnetlib test_zlib
 
-%define py_ver		3.0
+%define py_ver		3.2
+%define py_abi		%{py_ver}mu
 %define py_prefix	%{_prefix}
 %define py_libdir	%{py_prefix}/%{_lib}/python%{py_ver}
-%define py_incdir	%{_includedir}/python%{py_ver}
+%define py_incdir	%{_includedir}/python%{py_abi}
 %define py_sitedir	%{py_libdir}/site-packages
 %define py_dyndir	%{py_libdir}/lib-dynload
 
@@ -30,18 +36,17 @@ Summary(ru.UTF-8):	Язык программирования очень высо
 Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python3
-Version:	%{py_ver}.1
-Release:	2
+Version:	%{py_ver}
+Release:	0.1
 Epoch:		1
 License:	PSF
 Group:		Applications
-Source0:	http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
-# Source0-md5:	7291eac6a9a7a3642e309c78b8d744e5
-Patch1:		%{name}-pythonpath.patch
-Patch2:		%{name}-no_ndbm.patch
-Patch3:		%{name}-ac_fixes.patch
-Patch4:		%{name}-lib64.patch
-Patch5:		%{name}-noarch_to_datadir.patch
+Source0:	http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
+# Source0-md5:	563c0b4b8c8596e332cc076c4f013971
+Patch0:		%{name}-pythonpath.patch
+Patch1:		%{name}-ac_fixes.patch
+Patch2:		%{name}-lib64.patch
+Patch3:		%{name}-noarch_to_datadir.patch
 URL:		http://www.python.org/
 BuildRequires:	autoconf
 BuildRequires:	bluez-libs-devel
@@ -73,7 +78,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %if %{with verbose_tests}
 %define test_flags -v -l -x
 %else
-%define test_flags -l -x
+%define test_flags -w -l -x
 %endif
 
 %ifarch alpha ia64 ppc64 sparc64 ppc64 %{x8664}
@@ -205,6 +210,7 @@ Summary:	Python modules
 Summary(pl.UTF-8):	Moduły języka Python
 Group:		Libraries/Python
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:	python3-modules-sqlite
 
 %description modules
 Python officially distributed modules.
@@ -212,18 +218,6 @@ Python officially distributed modules.
 %description modules -l pl.UTF-8
 Oficjalnie rozprowadzane moduły języka Python.
 
-%package modules-sqlite
-Summary:	Python SQLite modules
-Summary(pl.UTF-8):	Moduły SQLite języka Python
-Group:		Libraries/Python
-Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-
-%description modules-sqlite
-Python officially distributed sqlite module.
-
-%description modules-sqlite -l pl.UTF-8
-Oficjalnie rozprowadzany moduł sqlite języka Python.
-
 %package -n pydoc3
 Summary:	Python interactive module documentation access support
 Summary(pl.UTF-8):	Interaktywne korzystanie z dokumentacji modułów języka Python
@@ -339,16 +333,27 @@ debugger.
 
 %package 2to3
 Summary:	Automated Python 2 to 3 code translation
-Summary(pl.UTF-8):	Automatyczne tłumaczenie kody Pythona 2 do 3
+Summary(pl.UTF-8):	Automatyczne tłumaczenie kodu Pythona 2 do 3
 Group:		Development/Languages/Pythona
 
 %description 2to3
-2to3 is a Python program that reads Python 2.x source code and applies a series
-of fixers to transform it into valid Python 3.x code. The standard library
-contains a rich set of fixers that will handle almost all code. 2to3 supporting
-library lib2to3 is, however, a flexible and generic library, so it is possible
-to write your own fixers for 2to3. lib2to3 could also be adapted to custom
-applications in which Python code needs to be edited automatically.
+2to3 is a Python program that reads Python 2.x source code and applies
+a series of fixers to transform it into valid Python 3.x code. The
+standard library contains a rich set of fixers that will handle almost
+all code. 2to3 supporting library lib2to3 is, however, a flexible and
+generic library, so it is possible to write your own fixers for 2to3.
+lib2to3 could also be adapted to custom applications in which Python
+code needs to be edited automatically.
+
+%description 2to3 -l pl.UTF-8
+2to3 to program w Pythonie czytający od źródłowy w Pythonie 2.x i
+aplikujący serię poprawek przekształcających go w poprawny kod w
+Pythonie 3.x. Biblioteka standardowa zawiera duży zbiór poprawek
+obsługujących większość kodu. Biblioteka wspierająca 2to3 (lib2to3)
+jest jednak elastyczną i ogólną biblioteką, więc można pisać własne
+poprawki dla 2to3. lib2to3 można także zaadaptować na potrzeby
+własnych zastosowań, w których kod w Pythonie musi być modyfikowany
+automatycznie.
 
 %package static
 Summary:	Static python library
@@ -362,59 +367,6 @@ Static python library.
 %description static -l pl.UTF-8
 Statyczna biblioteka Pythona.
 
-%package doc
-Summary:	Documentation on Python
-Summary(de.UTF-8):	Dokumentation zu Python
-Summary(es.UTF-8):	Documentación para Python
-Summary(fr.UTF-8):	Documentation sur Python
-Summary(pl.UTF-8):	Dokumentacja do Pythona
-Summary(pt_BR.UTF-8):	Documentação para a linguagem de programação Python
-Summary(ru.UTF-8):	Документация по языку Python
-Summary(tr.UTF-8):	Python belgeleri
-Summary(uk.UTF-8):	Документація по мові Python
-Group:		Documentation
-
-%description doc
-This package contains documentation on the Python language and
-interpretor as a mix of plain ASCII files and LaTeX sources.
-
-%description doc -l de.UTF-8
-Dieses Paket enthält Dokumentationen zu Python (Sprache und
-Interpreter) in Form von einfachen ASCII-Dateien und LaTeX-Quellen.
-
-%description doc -l es.UTF-8
-Documentación para Python. Contiene archivos en texto y PostScript.
-
-%description doc -l fr.UTF-8
-Ce paquetage contient la documentation sur le langage python et sur
-son interpréteur sous forme de fichiers ASCII et LaTeX.
-
-%description doc -l pl.UTF-8
-Oficjalna dokumentacja do Pythona. Zawiera przykładowe programy,
-narzędzia i dokumentację. Strony podręcznika man znajdują się w
-głównym pakiecie. Ten pakiet nie zawiera źródeł dokumentacji
-napisanych w LaTeXu, tylko gotowe do wykorzystania pliki postscriptowe
-i HTML.
-
-%description doc -l pt_BR.UTF-8
-O pacote python-doc contém documentação para a linguagem de
-programação e para o interpretador Python. Fornecida em arquivos texto
-e Postcript.
-
-%description doc -l ru.UTF-8
-Этот пакет содержит документацию по собственно языку Python и по
-исполняющему его интерпретатору в виде набора текстовых файлов и
-исходных текстов в формате LaTeX.
-
-%description doc -l tr.UTF-8
-Bu paket, Python dili ile ilgili belgeleri ve düz ASCII dosyaları ve
-LaTeX kaynaklarının bir karışımı olan yorumlayıcıyı içerir.
-
-%description doc -l uk.UTF-8
-Цей пакет містить документацію по власне мові Python та по виконуючому
-її інтерпретатору у вигляді набора текстових файлів та вихідних
-текстів у форматі LaTeX.
-
 %package doc-info
 Summary:	Documentation on Python in texinfo format
 Summary(pl.UTF-8):	Dokumentacja do Pythona w formacie texinfo
@@ -488,22 +440,20 @@ Przykładowe programy w Pythonie.
 Przykłady te są dla Pythona 2.3.4, nie %{version}.
 
 %prep
-%setup -q -n Python-%{version}%{beta}
+%setup -q -n Python-%{version}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-sed -i -e 's=@EXENAME@=%{_bindir}/python3=' Misc/python-config.in
 
 %build
-sed -i -e 's#-ltermcap#-ltinfo#g' configure*
 %{__autoconf}
-CPPFLAGS="-I/usr/include/ncursesw"; export CPPFLAGS
+CPPFLAGS="-I/usr/include/ncursesw %{rpmcppflags}"; export CPPFLAGS
 %configure \
 	--with-cxx-main="%{__cxx}" \
 	--enable-shared \
 	--enable-ipv6 \
+	--with-dbmliborder=gdbm:bdb \
 	--with-wide-unicode \
 	--with-signal-module \
 	--with-tsc \
@@ -511,13 +461,14 @@ CPPFLAGS="-I/usr/include/ncursesw"; export CPPFLAGS
 	--with-doc-strings \
 	--with-fpectl \
 	--with-system-ffi \
+	--with-computed-gotos \
 	LINKCC='$(PURIFY) $(CXX)' \
 	LDSHARED='$(CC) $(CFLAGS) -shared' \
 	BLDSHARED='$(CC) $(CFLAGS) -shared' \
 	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %{__make} \
-	OPT="%{rpmcflags}" 2>&1 | awk '
+	OPT="%{rpmcflags} -fno-caller-saves" 2>&1 | awk '
 BEGIN { fail = 0; logmsg = ""; }
 {
         if ($0 ~ /\*\*\* WARNING:/) {
@@ -553,14 +504,8 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}} \
 install Doc/info/python*info* $RPM_BUILD_ROOT%{_infodir}
 %endif
 
-install Makefile.pre.in $RPM_BUILD_ROOT%{py_libdir}/config
-
-mv $RPM_BUILD_ROOT{%{py_libdir}/config,%{_libdir}}/libpython%{py_ver}.a
-ln -sf libpython%{py_ver}.a $RPM_BUILD_ROOT%{_libdir}/libpython.a
-ln -sf libpython%{py_ver}.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libpython%{py_ver}.so
-
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a Tools Demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a Tools $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 #
 # create several useful aliases, such as timeit.py, profile.py, pdb.py, smtpd.py
@@ -594,35 +539,26 @@ sed 's/=/ /' \
 # pygettext.py is provided for compatibility
 install Tools/i18n/pygettext.py $RPM_BUILD_ROOT%{_bindir}/pygettext%{py_ver}
 
-# add py_ver
-for script in idle pydoc; do
-	mv $RPM_BUILD_ROOT%{_bindir}/${script} $RPM_BUILD_ROOT%{_bindir}/${script}%{py_ver}
-done
-
-ln -s python%{py_ver} $RPM_BUILD_ROOT%{_bindir}/python3
-
 # just to cut the noise, as they are not packaged (now)
 # first tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/bsddb/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/email/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/json/tests
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/email/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/importlib/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
+%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/tkinter/test
 
 # other files
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/macholib/fetch_macholib*
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/site-packages/README
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/distutils/command/wininst*.exe
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.bat
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.pyw
-rm -rf $RPM_BUILD_ROOT%{_bindir}/smtpd.py
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/plat-*/regen
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/macholib/fetch_macholib*
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/site-packages/README
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/distutils/command/wininst*.exe
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.bat
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/idlelib/*.pyw
 # already in %%doc
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/pdb.doc
-rm -rf $RPM_BUILD_ROOT%{py_scriptdir}/LICENSE.txt
+%{__rm} $RPM_BUILD_ROOT%{py_scriptdir}/LICENSE.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -630,22 +566,63 @@ rm -rf $RPM_BUILD_ROOT
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post doc-info	-p	/sbin/postshell
+%post	doc-info -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun doc-info	-p	/sbin/postshell
+%postun	doc-info -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/python%{py_ver}
+%attr(755,root,root) %{_bindir}/python%{py_abi}
 %attr(755,root,root) %{_bindir}/python3
+%{_mandir}/man1/python%{py_ver}.1*
+
+%files libs
+%defattr(644,root,root,755)
+%doc LICENSE
+%attr(755,root,root) %{_libdir}/libpython%{py_abi}.so.*.*
+
+%dir %{py_libdir}
+%dir %{py_dyndir}
+%dir %{py_sitedir}
+%dir %{py_scriptdir}
+%dir %{py_sitescriptdir}
+
+# shared modules required by python library
+%attr(755,root,root) %{py_dyndir}/_struct.cpython-*.so
+
+# modules required by python library
+%{py_scriptdir}/_abcoll.py[co]
+%{py_scriptdir}/_weakrefset.py[co]
+%{py_scriptdir}/abc.py[co]
+%{py_scriptdir}/codecs.py[co]
+%{py_scriptdir}/copyreg.py[co]
+%{py_scriptdir}/genericpath.py[co]
+%{py_scriptdir}/locale.py[co]
+%{py_scriptdir}/io.py[co]
+%{py_scriptdir}/posixpath.py[co]
+%{py_scriptdir}/site.py[co]
+%{py_scriptdir}/stat.py[co]
+%{py_scriptdir}/os.py[co]
+# needed by the dynamic sys.lib patch
+%{py_scriptdir}/types.py[co]
+
+# encodings required by python library
+%dir %{py_scriptdir}/encodings
+%{py_scriptdir}/encodings/*.py[co]
 
 %files modules
 %defattr(644,root,root,755)
 /etc/shrc.d/python*-modules*
+%exclude %{py_scriptdir}/_abcoll.py[co]
+%exclude %{py_scriptdir}/_weakrefset.py[co]
+%exclude %{py_scriptdir}/abc.py[co]
 %exclude %{py_scriptdir}/codecs.py[co]
 %exclude %{py_scriptdir}/copyreg.py[co]
+%exclude %{py_scriptdir}/genericpath.py[co]
+%exclude %{py_scriptdir}/io.py[co]
 %exclude %{py_scriptdir}/locale.py[co]
 %exclude %{py_scriptdir}/posixpath.py[co]
 %exclude %{py_scriptdir}/pdb.py[co]
@@ -661,7 +638,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{py_scriptdir}/*.py[co]
 
-%{py_dyndir}/*.egg-info
+%{py_dyndir}/Python-%{py_ver}-py*.egg-info
 
 #
 # list .so modules to be sure that all of them are built
@@ -670,66 +647,60 @@ rm -rf $RPM_BUILD_ROOT
 # modules below do not work on 64-bit architectures
 # see Python README file for explanation
 %ifnarch alpha ia64 ppc64 sparc64 %{x8664}
-%attr(755,root,root) %{py_dyndir}/audioop.so
+%attr(755,root,root) %{py_dyndir}/audioop.cpython-*.so
 %endif
 
-%attr(755,root,root) %{py_dyndir}/array.so
-%attr(755,root,root) %{py_dyndir}/atexit.so
-%attr(755,root,root) %{py_dyndir}/audioop.so
-%attr(755,root,root) %{py_dyndir}/binascii.so
-%attr(755,root,root) %{py_dyndir}/_bisect.so
-%attr(755,root,root) %{py_dyndir}/bz2.so
-%attr(755,root,root) %{py_dyndir}/cmath.so
-%attr(755,root,root) %{py_dyndir}/_codecs_cn.so
-%attr(755,root,root) %{py_dyndir}/_codecs_hk.so
-%attr(755,root,root) %{py_dyndir}/_codecs_iso2022.so
-%attr(755,root,root) %{py_dyndir}/_codecs_jp.so
-%attr(755,root,root) %{py_dyndir}/_codecs_kr.so
-%attr(755,root,root) %{py_dyndir}/_codecs_tw.so
-%attr(755,root,root) %{py_dyndir}/_collections.so
-%attr(755,root,root) %{py_dyndir}/crypt.so
-%attr(755,root,root) %{py_dyndir}/_csv.so
-%attr(755,root,root) %{py_dyndir}/_ctypes*.so
-%attr(755,root,root) %{py_dyndir}/_curses_panel.so
-%attr(755,root,root) %{py_dyndir}/_curses.so
-%attr(755,root,root) %{py_dyndir}/datetime.so
-%attr(755,root,root) %{py_dyndir}/_elementtree.so
-%attr(755,root,root) %{py_dyndir}/_functools.so
-%attr(755,root,root) %{py_dyndir}/_hashlib.so
-%attr(755,root,root) %{py_dyndir}/_heapq.so
-%attr(755,root,root) %{py_dyndir}/_json.so
-%attr(755,root,root) %{py_dyndir}/_locale.so
-%attr(755,root,root) %{py_dyndir}/_lsprof.so
-%attr(755,root,root) %{py_dyndir}/_multibytecodec.so
-%attr(755,root,root) %{py_dyndir}/_multiprocessing.so
-%attr(755,root,root) %{py_dyndir}/_pickle.so
-%attr(755,root,root) %{py_dyndir}/_random.so
-%attr(755,root,root) %{py_dyndir}/_socket.so
-%attr(755,root,root) %{py_dyndir}/_ssl.so
-%attr(755,root,root) %{py_dyndir}/_testcapi.so
+%attr(755,root,root) %{py_dyndir}/_bisect.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_codecs_cn.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_codecs_hk.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_codecs_iso2022.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_codecs_jp.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_codecs_kr.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_codecs_tw.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_csv.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_ctypes*.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_curses_panel.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_curses.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_datetime.cpython-*.so
 %ifnarch sparc64
-%attr(755,root,root) %{py_dyndir}/_dbm.so
+%attr(755,root,root) %{py_dyndir}/_dbm.cpython-*.so
 %endif
-%attr(755,root,root) %{py_dyndir}/fcntl.so
-%attr(755,root,root) %{py_dyndir}/_gdbm.so
-%attr(755,root,root) %{py_dyndir}/grp.so
-%attr(755,root,root) %{py_dyndir}/itertools.so
-%attr(755,root,root) %{py_dyndir}/math.so
-%attr(755,root,root) %{py_dyndir}/mmap.so
-%attr(755,root,root) %{py_dyndir}/nis.so
-%attr(755,root,root) %{py_dyndir}/operator.so
-%attr(755,root,root) %{py_dyndir}/ossaudiodev.so
-%attr(755,root,root) %{py_dyndir}/parser.so
-%attr(755,root,root) %{py_dyndir}/pyexpat.so
-%attr(755,root,root) %{py_dyndir}/readline.so
-%attr(755,root,root) %{py_dyndir}/resource.so
-%attr(755,root,root) %{py_dyndir}/select.so
-%attr(755,root,root) %{py_dyndir}/syslog.so
-%attr(755,root,root) %{py_dyndir}/termios.so
-%attr(755,root,root) %{py_dyndir}/time.so
-%attr(755,root,root) %{py_dyndir}/spwd.so
-%attr(755,root,root) %{py_dyndir}/unicodedata.so
-%attr(755,root,root) %{py_dyndir}/zlib.so
+%attr(755,root,root) %{py_dyndir}/_elementtree.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_gdbm.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_hashlib.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_heapq.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_json.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_lsprof.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_multibytecodec.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_multiprocessing.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_pickle.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_random.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_socket.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_ssl.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_testcapi.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/array.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/atexit.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/binascii.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/bz2.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/cmath.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/crypt.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/fcntl.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/grp.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/math.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/mmap.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/nis.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/ossaudiodev.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/parser.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/pyexpat.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/readline.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/resource.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/select.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/syslog.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/termios.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/time.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/spwd.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/unicodedata.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/zlib.cpython-*.so
 
 %dir %{py_scriptdir}/plat-*
 %{py_scriptdir}/plat-*/*.py[co]
@@ -765,6 +736,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_scriptdir}/http
 %{py_scriptdir}/http/*.py[co]
 
+%dir %{py_scriptdir}/importlib
+%{py_scriptdir}/importlib/*.py[co]
+
 %dir %{py_scriptdir}/json
 %{py_scriptdir}/json/*.py[co]
 
@@ -797,49 +771,20 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_scriptdir}/xmlrpc
 %{py_scriptdir}/xmlrpc/*.py[co]
 
-%files modules-sqlite
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_dyndir}/_sqlite3.so
+%attr(755,root,root) %{py_dyndir}/_sqlite3.cpython-*.so
 %dir %{py_scriptdir}/sqlite3
 %{py_scriptdir}/sqlite3/*.py[co]
 
-%files libs
-%defattr(644,root,root,755)
-%doc LICENSE
-%attr(755,root,root) %{_libdir}/libpython*.so.*
-
-%dir %{py_dyndir}
-%dir %{py_scriptdir}
-%dir %{py_libdir}
-%dir %{py_sitescriptdir}
-%dir %{py_sitedir}
-
-# shared modules required by python library
-%attr(755,root,root) %{py_dyndir}/_struct.so
-
-# modules required by python library
-%{py_scriptdir}/codecs.py[co]
-%{py_scriptdir}/copyreg.py[co]
-%{py_scriptdir}/locale.py[co]
-%{py_scriptdir}/posixpath.py[co]
-%{py_scriptdir}/site.py[co]
-%{py_scriptdir}/stat.py[co]
-%{py_scriptdir}/os.py[co]
-# needed by the dynamic sys.lib patch
-%{py_scriptdir}/types.py[co]
-
-# encodings required by python library
-%dir %{py_scriptdir}/encodings
-%{py_scriptdir}/encodings/*.py[co]
-
 %files -n pydoc3
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pydoc%{py_ver}
+%attr(755,root,root) %{_bindir}/pydoc3
 %{py_scriptdir}/pydoc.py[co]
+%dir %{py_scriptdir}/pydoc_data
+%{py_scriptdir}/pydoc_data/*.py[co]
 
 %files -n idle3
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/idle%{py_ver}
+%attr(755,root,root) %{_bindir}/idle3
 %dir %{py_scriptdir}/idlelib
 %dir %{py_scriptdir}/idlelib/Icons
 %{py_scriptdir}/idlelib/*.py[co]
@@ -852,21 +797,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc Misc/{ACKS,NEWS,README,README.valgrind,valgrind-python.supp}
 %attr(755,root,root) %{_bindir}/python%{py_ver}-config
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_bindir}/python%{py_abi}-config
+%attr(755,root,root) %{_bindir}/python3-config
+%attr(755,root,root) %{_libdir}/libpython%{py_abi}.so
+%attr(755,root,root) %{_libdir}/libpython3.so
 %dir %{py_incdir}
 %{py_incdir}/*.h
-
-%dir %{py_libdir}/config
-%attr(755,root,root) %{py_libdir}/config/makesetup
-%attr(755,root,root) %{py_libdir}/config/install-sh
-%{py_libdir}/config/Makefile
-%{py_libdir}/config/Makefile.pre.in
-%{py_libdir}/config/Setup
-%{py_libdir}/config/Setup.config
-%{py_libdir}/config/Setup.local
-%{py_libdir}/config/config.c
-%{py_libdir}/config/config.c.in
-%{py_libdir}/config/python.o
+%{_pkgconfigdir}/python-%{py_ver}.pc
+%{_pkgconfigdir}/python-%{py_abi}.pc
+%{_pkgconfigdir}/python3.pc
+
+%dir %{py_libdir}/config-%{py_abi}
+%attr(755,root,root) %{py_libdir}/config-%{py_abi}/makesetup
+%attr(755,root,root) %{py_libdir}/config-%{py_abi}/install-sh
+%{py_libdir}/config-%{py_abi}/Makefile
+%{py_libdir}/config-%{py_abi}/Setup
+%{py_libdir}/config-%{py_abi}/Setup.config
+%{py_libdir}/config-%{py_abi}/Setup.local
+%{py_libdir}/config-%{py_abi}/config.c
+%{py_libdir}/config-%{py_abi}/config.c.in
+%{py_libdir}/config-%{py_abi}/python.o
 
 %files devel-src
 %defattr(644,root,root,755)
@@ -880,31 +830,31 @@ rm -rf $RPM_BUILD_ROOT
 %{py_scriptdir}/distutils/command/*.py
 %{py_scriptdir}/email/*.py
 %{py_scriptdir}/email/mime/*.py
+%{py_scriptdir}/encodings/*.py
 %{py_scriptdir}/html/*.py
 %{py_scriptdir}/http/*.py
+%{py_scriptdir}/idlelib/*.py
+%{py_scriptdir}/importlib/*.py
 %{py_scriptdir}/json/*.py
 %{py_scriptdir}/lib2to3/*.py
-%{py_scriptdir}/lib2to3/fixes/*.py
 %{py_scriptdir}/lib2to3/pgen2/*.py
 %{py_scriptdir}/logging/*.py
 %{py_scriptdir}/multiprocessing/*.py
 %{py_scriptdir}/multiprocessing/dummy/*.py
+%{py_scriptdir}/pydoc_data/*.py
 %{py_scriptdir}/sqlite3/*.py
+%{py_scriptdir}/tkinter/*.py
 %{py_scriptdir}/urllib/*.py
 %{py_scriptdir}/wsgiref/*.py
-%{py_scriptdir}/tkinter/*.py
 %{py_scriptdir}/xml/*.py
 %{py_scriptdir}/xml/dom/*.py
 %{py_scriptdir}/xml/etree/*.py
 %{py_scriptdir}/xml/parsers/*.py
 %{py_scriptdir}/xml/sax/*.py
 %{py_scriptdir}/xmlrpc/*.py
-%{py_scriptdir}/encodings/*.py
-%{py_scriptdir}/idlelib/*.py
 
 %files devel-tools
 %defattr(644,root,root,755)
-%doc Lib/pdb.doc
 /etc/shrc.d/python*-devel*
 
 %attr(755,root,root) %{_bindir}/pygettext%{py_ver}
@@ -915,19 +865,20 @@ rm -rf $RPM_BUILD_ROOT
 %{py_scriptdir}/timeit.py[co]
 
 %files 2to3
-%attr(755,root,root) %{_bindir}/2to3
+%attr(755,root,root) %{_bindir}/2to3-%{py_ver}
 %dir %{py_scriptdir}/lib2to3
 %{py_scriptdir}/lib2to3/*.txt
 %{py_scriptdir}/lib2to3/*.pickle
 %{py_scriptdir}/lib2to3/*.py[co]
 %dir %{py_scriptdir}/lib2to3/fixes
+%{py_scriptdir}/lib2to3/fixes/*.py
 %{py_scriptdir}/lib2to3/fixes/*.py[co]
 %dir %{py_scriptdir}/lib2to3/pgen2
 %{py_scriptdir}/lib2to3/pgen2/*.py[co]
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libpython%{py_abi}.a
 
 %files examples
 %defattr(644,root,root,755)
@@ -944,5 +895,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{py_scriptdir}/tkinter
 %{py_scriptdir}/tkinter/*.py[co]
-%attr(755,root,root) %{py_dyndir}/_tkinter.so
+%attr(755,root,root) %{py_dyndir}/_tkinter.cpython-*.so
 %endif