2010-01-13 21:25:18 +00:00
|
|
|
%global pybasever 3.1
|
|
|
|
%global pylibdir %{_libdir}/python%{pybasever}
|
2010-01-28 19:09:18 +00:00
|
|
|
%global dynload_dir %{pylibdir}/lib-dynload
|
2010-01-13 21:25:18 +00:00
|
|
|
|
2010-02-09 03:51:42 +00:00
|
|
|
# Python's configure script defines SOVERSION, and this is used in the Makefile
|
|
|
|
# to determine INSTSONAME, the name of the libpython DSO:
|
|
|
|
# LDLIBRARY='libpython$(VERSION).so'
|
|
|
|
# INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
|
|
# We mirror this here in order to make it easier to add the -gdb.py hooks.
|
|
|
|
# (if these get out of sync, the payload of the libs subpackage will fail
|
|
|
|
# and halt the build)
|
|
|
|
%global py_SOVERSION 1.0
|
|
|
|
%global py_INSTSONAME libpython%{pybasever}.so.%{py_SOVERSION}
|
|
|
|
|
2010-02-08 20:41:07 +00:00
|
|
|
%global with_gdb_hooks 1
|
|
|
|
|
2010-02-12 21:38:52 +00:00
|
|
|
%global with_systemtap 1
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
# We want to byte-compile the .py files within the packages using the new
|
|
|
|
# python3 binary.
|
|
|
|
#
|
|
|
|
# Unfortunately, rpmbuild's infrastructure requires us to jump through some
|
|
|
|
# hoops to avoid byte-compiling with the system python 2 version:
|
|
|
|
# /usr/lib/rpm/redhat/macros sets up build policy that (amongst other things)
|
|
|
|
# defines __os_install_post. In particular, "brp-python-bytecompile" is
|
|
|
|
# invoked without an argument thus using the wrong version of python
|
|
|
|
# (/usr/bin/python, rather than the freshly built python), thus leading to
|
|
|
|
# numerous syntax errors, and incorrect magic numbers in the .pyc files. We
|
|
|
|
# thus override __os_install_post to avoid invoking this script:
|
|
|
|
%global __os_install_post /usr/lib/rpm/redhat/brp-compress \
|
|
|
|
%{!?__debug_package:/usr/lib/rpm/redhat/brp-strip %{__strip}} \
|
|
|
|
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
|
|
|
|
/usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \
|
|
|
|
/usr/lib/rpm/redhat/brp-python-hardlink
|
|
|
|
# to remove the invocation of brp-python-bytecompile, whilst keeping the
|
|
|
|
# invocation of brp-python-hardlink (since this should still work for python3
|
|
|
|
# pyc/pyo files)
|
|
|
|
|
|
|
|
Summary: Version 3 of the Python programming language aka Python 3000
|
|
|
|
Name: python3
|
|
|
|
Version: %{pybasever}.1
|
2010-02-12 21:38:52 +00:00
|
|
|
Release: 25%{?dist}
|
2010-01-13 21:25:18 +00:00
|
|
|
License: Python
|
|
|
|
Group: Development/Languages
|
|
|
|
Source: http://python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
|
|
|
|
|
|
|
|
# Avoid having various bogus auto-generated Provides lines for the various
|
|
|
|
# python c modules' SONAMEs:
|
|
|
|
Source1: find-provides-without-python-sonames.sh
|
|
|
|
%global _use_internal_dependency_generator 0
|
|
|
|
%global __find_provides %{SOURCE1}
|
|
|
|
|
|
|
|
# Supply various useful macros for building python 3 modules:
|
|
|
|
# __python3, python3_sitelib, python3_sitearch
|
|
|
|
Source2: macros.python3
|
|
|
|
|
2010-01-28 19:09:18 +00:00
|
|
|
# Supply an RPM macro "py_byte_compile" for the python3-devel subpackage
|
|
|
|
# to enable specfiles to selectively byte-compile individual files and paths
|
|
|
|
# with different Python runtimes as necessary:
|
|
|
|
Source3: macros.pybytecompile
|
|
|
|
|
2010-02-08 20:41:07 +00:00
|
|
|
# We install a collection of hooks for gdb that make it easier to debug
|
|
|
|
# executables linked against libpython (such as /usr/lib/python itself)
|
|
|
|
#
|
2010-02-09 03:51:42 +00:00
|
|
|
# These hooks are implemented in Python itself (though they are for the version
|
|
|
|
# of python that gdb is linked with, in this case Python 2.6)
|
2010-02-08 20:41:07 +00:00
|
|
|
#
|
2010-02-09 03:51:42 +00:00
|
|
|
# gdb-archer looks for them in the same path as the ELF file, with a -gdb.py suffix.
|
|
|
|
# We put them in the debuginfo package by installing them to e.g.:
|
2010-02-08 20:41:07 +00:00
|
|
|
# /usr/lib/debug/usr/lib/libpython3.1.so.1.0.debug-gdb.py
|
|
|
|
#
|
|
|
|
# See https://fedoraproject.org/wiki/Features/EasierPythonDebugging for more
|
|
|
|
# information
|
|
|
|
#
|
|
|
|
# Downloaded from:
|
|
|
|
# http://fedorapeople.org/gitweb?p=dmalcolm/public_git/libpython.git;a=snapshot;h=36a517ef7848cbd0b3dcc7371f32e47ac4c87eba;sf=tgz
|
|
|
|
Source4: libpython-36a517ef7848cbd0b3dcc7371f32e47ac4c87eba.tar.gz
|
|
|
|
|
2010-02-12 21:38:52 +00:00
|
|
|
# Systemtap tapset to make it easier to use the systemtap static probes
|
|
|
|
# (actually a template; LIBRARY_PATH will get fixed up during install)
|
|
|
|
# Written by dmalcolm; not yet sent upstream
|
|
|
|
Source5: libpython.stp
|
|
|
|
|
|
|
|
# Example systemtap script using the tapset
|
|
|
|
# Written by wcohen, mjw, dmalcolm; not yet sent upstream
|
|
|
|
Source6: systemtap-example.stp
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
Patch0: python-3.1.1-config.patch
|
|
|
|
|
|
|
|
|
|
|
|
# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
|
|
|
|
# Was Patch0 in ivazquez' python3000 specfile:
|
|
|
|
Patch1: Python-3.1.1-rpath.patch
|
|
|
|
|
|
|
|
# Fixup importlib/_bootstrap.py so that it correctly handles being unable to
|
|
|
|
# open .pyc files for writing
|
|
|
|
# Sent upstream as http://bugs.python.org/issue7187
|
|
|
|
Patch2: python-3.1.1-importlib-fix-handling-of-readonly-pyc-files.patch
|
|
|
|
|
|
|
|
# The four TestMIMEAudio tests fail due to "audiotest.au" not being packaged.
|
|
|
|
# It's simplest to remove them:
|
|
|
|
Patch3: python-3.1.1-remove-mimeaudio-tests.patch
|
|
|
|
|
|
|
|
# ImportTests.test_issue1267 in test_imp.py reads pydoc.py's shebang line and
|
|
|
|
# checks that it read it correctly.
|
|
|
|
#
|
|
|
|
# Since we modify the shebang lines in our packaging, we also need to modify
|
|
|
|
# the expected value in this test:
|
|
|
|
Patch4: python-3.1.1-apply-our-changes-to-expected-shebang-for-test_imp.patch
|
|
|
|
|
|
|
|
# test_tk test_ttk_guionly and test_ttk_textonly all rely on tkinter/test, but
|
|
|
|
# upstream's Makefile.pre.in doesn't install that subdirectory; patch it so that
|
|
|
|
# it does:
|
|
|
|
Patch5: python-3.1.1-install-tkinter-tests.patch
|
|
|
|
# (The resulting test support code is in the tkinter subpackage, but
|
|
|
|
# this is not a major problem)
|
|
|
|
|
2010-01-18 17:59:07 +00:00
|
|
|
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
|
|
|
|
# a libpythonMAJOR.MINOR.a (bug 550692):
|
|
|
|
Patch6: python-3.1.1-no-static-lib.patch
|
|
|
|
|
2010-01-28 19:56:39 +00:00
|
|
|
# Fixup configure.in and setup.py to build against system expat library.
|
|
|
|
# Adapted from http://svn.python.org/view?view=rev&revision=77170
|
|
|
|
Patch7: python-3.1.1-with-system-expat.patch
|
|
|
|
|
2010-02-12 21:38:52 +00:00
|
|
|
# Systemtap support: add statically-defined probe points
|
|
|
|
# Patch based on upstream bug: http://bugs.python.org/issue4111
|
|
|
|
# fixed up by mjw and wcohen for 2.6.2, then fixed up by dmalcolm for 2.6.4
|
|
|
|
# then rewritten by mjw (attachment 390110 of rhbz 545179); ported to 3.1.1 by
|
|
|
|
# dmalcolm
|
|
|
|
Patch8: python-3.1.1-systemtap.patch
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
Patch102: python-3.1.1-lib64.patch
|
|
|
|
|
|
|
|
# http://bugs.python.org/issue6999 -- fixed in r75062
|
|
|
|
Patch200: python-3.1.1-pathfix.patch
|
|
|
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
BuildRequires: readline-devel, openssl-devel, gmp-devel
|
|
|
|
BuildRequires: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
|
|
|
|
BuildRequires: libGL-devel gcc-c++ libX11-devel glibc-devel
|
|
|
|
BuildRequires: bzip2 tar /usr/bin/find pkgconfig tcl-devel tk-devel
|
|
|
|
BuildRequires: tix-devel bzip2-devel sqlite-devel
|
|
|
|
BuildRequires: autoconf
|
|
|
|
BuildRequires: db4-devel >= 4.7
|
|
|
|
BuildRequires: libffi-devel
|
|
|
|
|
2010-02-12 21:38:52 +00:00
|
|
|
%if 0%{?with_systemtap}
|
|
|
|
BuildRequires: systemtap-sdt-devel
|
|
|
|
%global tapsetdir /usr/share/systemtap/tapset
|
|
|
|
%endif
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
URL: http://www.python.org/
|
|
|
|
|
|
|
|
# See notes in bug 532118:
|
|
|
|
Provides: python(abi) = %{pybasever}
|
|
|
|
|
|
|
|
%description
|
|
|
|
Python 3 is a new version of the language that is incompatible with the 2.x
|
|
|
|
line of releases. The language is mostly the same, but many details, especially
|
|
|
|
how built-in objects like dictionaries and strings work, have changed
|
|
|
|
considerably, and a lot of deprecated features have finally been removed.
|
|
|
|
|
|
|
|
%package libs
|
|
|
|
Summary: Python 3 runtime libraries
|
|
|
|
Group: Development/Libraries
|
|
|
|
#Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description libs
|
|
|
|
This package contains files used to embed Python 3 into applications.
|
|
|
|
|
|
|
|
%package devel
|
|
|
|
Summary: Libraries and header files needed for Python 3 development
|
|
|
|
Group: Development/Libraries
|
2010-01-16 01:20:39 +00:00
|
|
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
2010-01-13 21:25:18 +00:00
|
|
|
Conflicts: %{name} < %{version}-%{release}
|
|
|
|
|
|
|
|
%description devel
|
|
|
|
This package contains libraries and header files used to build applications
|
|
|
|
with and native libraries for Python 3
|
|
|
|
|
|
|
|
%package tools
|
|
|
|
Summary: A collection of tools included with Python 3
|
|
|
|
Group: Development/Tools
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
Requires: %{name}-tkinter = %{version}-%{release}
|
|
|
|
|
|
|
|
%description tools
|
|
|
|
This package contains several tools included with Python 3
|
|
|
|
|
|
|
|
%package tkinter
|
|
|
|
Summary: A GUI toolkit for Python 3
|
|
|
|
Group: Development/Languages
|
|
|
|
BuildRequires: tcl, tk
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
%description tkinter
|
|
|
|
The Tkinter (Tk interface) program is an graphical user interface for
|
|
|
|
the Python scripting language.
|
|
|
|
|
|
|
|
%package test
|
|
|
|
Summary: The test modules from the main python 3 package
|
|
|
|
Group: Development/Languages
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
Requires: %{name}-tools = %{version}-%{release}
|
|
|
|
|
|
|
|
%description test
|
|
|
|
The test modules from the main %{name} package.
|
|
|
|
These are in a separate package to save space, as they are almost never used
|
|
|
|
in production.
|
|
|
|
|
|
|
|
You might want to install the python3-test package if you're developing
|
|
|
|
python 3 code that uses more than just unittest and/or test_support.py.
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%setup -q -n Python-%{version}
|
|
|
|
chmod +x %{SOURCE1}
|
2010-01-16 01:20:39 +00:00
|
|
|
|
2010-02-08 20:41:07 +00:00
|
|
|
# Unpack source archive 4 into this same dir without deleting (-D; -T suppress
|
|
|
|
# trying to unpack source 0 again):
|
|
|
|
%if 0%{?with_gdb_hooks}
|
|
|
|
%setup -q -n Python-%{version} -T -D -a 4
|
|
|
|
%endif # with_gdb_hooks
|
|
|
|
|
2010-02-12 21:38:52 +00:00
|
|
|
%if 0%{?with_systemtap}
|
|
|
|
# Provide an example of usage of the tapset:
|
|
|
|
cp -a %{SOURCE6} .
|
|
|
|
%endif # with_systemtap
|
|
|
|
|
2010-01-28 19:56:39 +00:00
|
|
|
# Ensure that we're using the system copy of various libraries, rather than
|
|
|
|
# copies shipped by upstream in the tarball:
|
|
|
|
# Remove embedded copy of expat:
|
|
|
|
rm -r Modules/expat || exit 1
|
|
|
|
|
|
|
|
# Remove embedded copy of libffi:
|
2010-01-16 01:20:39 +00:00
|
|
|
for SUBDIR in darwin libffi libffi_arm_wince libffi_msvc libffi_osx ; do
|
|
|
|
rm -r Modules/_ctypes/$SUBDIR || exit 1 ;
|
|
|
|
done
|
|
|
|
|
2010-01-28 19:56:39 +00:00
|
|
|
# Remove embedded copy of zlib:
|
|
|
|
rm -r Modules/zlib || exit 1
|
|
|
|
|
|
|
|
#
|
|
|
|
# Apply patches:
|
|
|
|
#
|
2010-01-13 21:25:18 +00:00
|
|
|
%patch0 -p1 -b .config
|
|
|
|
%patch1 -p1 -b .rpath
|
|
|
|
%patch2 -p0 -b .fix-handling-of-readonly-pyc-files
|
|
|
|
%patch3 -p1 -b .remove-mimeaudio-tests
|
|
|
|
%patch4 -p1 -b .apply-our-changes-to-expected-shebang
|
|
|
|
%patch5 -p1 -b .install-tkinter-tests
|
2010-01-18 17:59:07 +00:00
|
|
|
%patch6 -p1 -b .no-static-lib
|
2010-01-28 19:56:39 +00:00
|
|
|
%patch7 -p1 -b .expat
|
2010-02-12 21:38:52 +00:00
|
|
|
%if 0%{?with_systemtap}
|
|
|
|
%patch8 -p1 -b .systemtap
|
|
|
|
%endif
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
%if "%{_lib}" == "lib64"
|
|
|
|
%patch102 -p1 -b .lib64
|
|
|
|
%endif
|
|
|
|
|
|
|
|
%patch200 -p1 -b .pathfix
|
|
|
|
|
2010-01-15 21:08:54 +00:00
|
|
|
# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
|
|
|
|
# are many differences between 2.6 and the Python 3 library.
|
|
|
|
#
|
|
|
|
# Fix up the URLs within pydoc to point at the documentation for this
|
|
|
|
# MAJOR.MINOR version:
|
|
|
|
#
|
|
|
|
sed --in-place \
|
|
|
|
--expression="s|http://docs.python.org/library|http://docs.python.org/%{pybasever}/library|g" \
|
|
|
|
Lib/pydoc.py || exit 1
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
%build
|
|
|
|
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
|
|
|
|
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
|
|
|
|
export CPPFLAGS="`pkg-config --cflags-only-I libffi`"
|
|
|
|
export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
|
|
|
|
export LINKCC="gcc"
|
|
|
|
export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
|
|
|
|
export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
|
|
|
|
|
|
|
|
autoconf
|
2010-02-12 21:38:52 +00:00
|
|
|
|
|
|
|
# For patch 8 (systemtap), we need to get a new header for configure to use:
|
|
|
|
autoheader
|
|
|
|
|
|
|
|
%configure \
|
|
|
|
--enable-ipv6 \
|
|
|
|
--with-wide-unicode \
|
|
|
|
--enable-shared \
|
|
|
|
%if 0%{?with_systemtap}
|
|
|
|
--with-dtrace \
|
|
|
|
--with-tapset-install-dir=%{tapsetdir} \
|
|
|
|
%endif
|
|
|
|
--with-system-ffi \
|
|
|
|
--with-system-expat
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
make OPT="$CFLAGS" %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
rm -fr $RPM_BUILD_ROOT
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_prefix} $RPM_BUILD_ROOT%{_mandir}
|
|
|
|
|
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
mkdir -p ${RPM_BUILD_ROOT}%{pylibdir}/site-packages
|
|
|
|
|
2010-01-28 19:09:18 +00:00
|
|
|
mv ${RPM_BUILD_ROOT}%{_bindir}/2to3 ${RPM_BUILD_ROOT}%{_bindir}/python3-2to3
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
# Development tools
|
|
|
|
install -m755 -d ${RPM_BUILD_ROOT}%{pylibdir}/Tools
|
|
|
|
install Tools/README ${RPM_BUILD_ROOT}%{pylibdir}/Tools/
|
|
|
|
cp -ar Tools/freeze ${RPM_BUILD_ROOT}%{pylibdir}/Tools/
|
|
|
|
cp -ar Tools/i18n ${RPM_BUILD_ROOT}%{pylibdir}/Tools/
|
|
|
|
cp -ar Tools/modulator ${RPM_BUILD_ROOT}%{pylibdir}/Tools/
|
|
|
|
cp -ar Tools/pynche ${RPM_BUILD_ROOT}%{pylibdir}/Tools/
|
|
|
|
cp -ar Tools/scripts ${RPM_BUILD_ROOT}%{pylibdir}/Tools/
|
|
|
|
|
|
|
|
# Documentation tools
|
|
|
|
install -m755 -d $RPM_BUILD_ROOT%{pylibdir}/Doc
|
|
|
|
cp -ar Doc/tools $RPM_BUILD_ROOT%{pylibdir}/Doc/
|
|
|
|
|
|
|
|
# Demo scripts
|
|
|
|
cp -ar Demo $RPM_BUILD_ROOT%{pylibdir}/
|
|
|
|
|
|
|
|
# Fix for bug #136654
|
|
|
|
rm -f $RPM_BUILD_ROOT%{pylibdir}/email/test/data/audiotest.au $RPM_BUILD_ROOT%{pylibdir}/test/audiotest.au
|
|
|
|
|
|
|
|
%if "%{_lib}" == "lib64"
|
|
|
|
install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
|
|
|
|
%endif
|
|
|
|
|
|
|
|
# Make python3-devel multilib-ready (bug #192747, #139911)
|
|
|
|
%global _pyconfig32_h pyconfig-32.h
|
|
|
|
%global _pyconfig64_h pyconfig-64.h
|
|
|
|
|
|
|
|
%ifarch ppc64 s390x x86_64 ia64 alpha sparc64
|
|
|
|
%global _pyconfig_h %{_pyconfig64_h}
|
|
|
|
%else
|
|
|
|
%global _pyconfig_h %{_pyconfig32_h}
|
|
|
|
%endif
|
|
|
|
mv $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h \
|
|
|
|
$RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/%{_pyconfig_h}
|
|
|
|
cat > $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h << EOF
|
|
|
|
#include <bits/wordsize.h>
|
|
|
|
|
|
|
|
#if __WORDSIZE == 32
|
|
|
|
#include "%{_pyconfig32_h}"
|
|
|
|
#elif __WORDSIZE == 64
|
|
|
|
#include "%{_pyconfig64_h}"
|
|
|
|
#else
|
|
|
|
#error "Unknown word size"
|
|
|
|
#endif
|
|
|
|
EOF
|
|
|
|
|
|
|
|
# Fix for bug 201434: make sure distutils looks at the right pyconfig.h file
|
|
|
|
sed -i -e "s/'pyconfig.h'/'%{_pyconfig_h}'/" $RPM_BUILD_ROOT%{pylibdir}/distutils/sysconfig.py
|
|
|
|
|
|
|
|
# Switch all shebangs to refer to the specific Python version.
|
|
|
|
LD_LIBRARY_PATH=. ./python Tools/scripts/pathfix.py -i "%{_bindir}/python%{pybasever}" $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
# Remove shebang lines from .py files that aren't executable, and
|
|
|
|
# remove executability from .py files that don't have a shebang line:
|
|
|
|
find $RPM_BUILD_ROOT -name \*.py \
|
|
|
|
\( \( \! -perm /u+x,g+x,o+x -exec sed -e '/^#!/Q 0' -e 'Q 1' {} \; \
|
|
|
|
-print -exec sed -i '1d' {} \; \) -o \( \
|
|
|
|
-perm /u+x,g+x,o+x ! -exec grep -m 1 -q '^#!' {} \; \
|
|
|
|
-exec chmod a-x {} \; \) \)
|
|
|
|
|
|
|
|
# .xpm and .xbm files should not be executable:
|
|
|
|
find $RPM_BUILD_ROOT \
|
|
|
|
\( -name \*.xbm -o -name \*.xpm -o -name \*.xpm.1 \) \
|
|
|
|
-exec chmod a-x {} \;
|
|
|
|
|
|
|
|
# Remove executable flag from files that shouldn't have it:
|
|
|
|
chmod a-x \
|
|
|
|
$RPM_BUILD_ROOT%{pylibdir}/Demo/comparisons/patterns \
|
|
|
|
$RPM_BUILD_ROOT%{pylibdir}/distutils/tests/Setup.sample \
|
|
|
|
$RPM_BUILD_ROOT%{pylibdir}/Demo/rpc/test \
|
|
|
|
$RPM_BUILD_ROOT%{pylibdir}/Tools/README \
|
|
|
|
$RPM_BUILD_ROOT%{pylibdir}/Demo/scripts/newslist.doc \
|
|
|
|
$RPM_BUILD_ROOT%{pylibdir}/Demo/md5test/foo
|
|
|
|
|
|
|
|
# Get rid of DOS batch files:
|
|
|
|
find $RPM_BUILD_ROOT -name \*.bat -exec rm {} \;
|
|
|
|
|
|
|
|
# Get rid of backup files:
|
|
|
|
find $RPM_BUILD_ROOT/ -name "*~" -exec rm -f {} \;
|
|
|
|
find . -name "*~" -exec rm -f {} \;
|
|
|
|
rm -f $RPM_BUILD_ROOT%{pylibdir}/LICENSE.txt
|
|
|
|
# Junk, no point in putting in -test sub-pkg
|
|
|
|
rm -f ${RPM_BUILD_ROOT}/%{pylibdir}/idlelib/testcode.py*
|
|
|
|
|
|
|
|
# Get rid of stray patch file from buildroot:
|
|
|
|
rm -f $RPM_BUILD_ROOT%{pylibdir}/test/test_imp.py.apply-our-changes-to-expected-shebang # from patch 4
|
|
|
|
|
|
|
|
# Fix end-of-line encodings:
|
|
|
|
find $RPM_BUILD_ROOT/ -name \*.py -exec sed -i 's/\r//' {} \;
|
|
|
|
|
|
|
|
# Fix an encoding:
|
|
|
|
iconv -f iso8859-1 -t utf-8 $RPM_BUILD_ROOT/%{pylibdir}/Demo/rpc/README > README.conv && mv -f README.conv $RPM_BUILD_ROOT/%{pylibdir}/Demo/rpc/README
|
|
|
|
|
|
|
|
# Note that
|
|
|
|
# %{pylibdir}/Demo/distutils/test2to3/setup.py
|
|
|
|
# is in iso-8859-1 encoding, and that this is deliberate; this is test data
|
|
|
|
# for the 2to3 tool, and one of the functions of the 2to3 tool is to fixup
|
|
|
|
# character encodings within python source code
|
|
|
|
|
|
|
|
# Do bytecompilation with the new interpreter.
|
|
|
|
LD_LIBRARY_PATH=. /usr/lib/rpm/brp-python-bytecompile ./python
|
|
|
|
|
|
|
|
# Fixup permissions for shared libraries from non-standard 555 to standard 755:
|
|
|
|
find $RPM_BUILD_ROOT \
|
|
|
|
-perm 555 -exec chmod 755 {} \;
|
|
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rpm
|
|
|
|
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/rpm
|
2010-01-28 19:09:18 +00:00
|
|
|
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/rpm
|
2010-01-13 21:25:18 +00:00
|
|
|
|
2010-01-25 18:44:42 +00:00
|
|
|
# Ensure that the curses module was linked against libncursesw.so, rather than
|
|
|
|
# libncurses.so (bug 539917)
|
2010-01-28 19:09:18 +00:00
|
|
|
ldd $RPM_BUILD_ROOT/%{dynload_dir}/_curses*.so \
|
2010-01-25 18:44:42 +00:00
|
|
|
| grep curses \
|
|
|
|
| grep libncurses.so && (echo "_curses.so linked against libncurses.so" ; exit 1)
|
|
|
|
|
2010-02-08 20:41:07 +00:00
|
|
|
# Copy up the gdb hooks into place; the python file will be autoloaded by gdb
|
|
|
|
# when visiting libpython.so, provided that the python file is installed to the
|
|
|
|
# same path as the library (or its .debug file) plus a "-gdb.py" suffix, e.g:
|
2010-02-09 03:51:42 +00:00
|
|
|
# /usr/lib/debug/usr/lib64/libpython3.1.so.1.0.debug-gdb.py
|
|
|
|
# (note that the debug path is /usr/lib/debug for both 32/64 bit)
|
|
|
|
#
|
|
|
|
# Initially I tried:
|
2010-02-08 20:41:07 +00:00
|
|
|
# /usr/lib/libpython3.1.so.1.0-gdb.py
|
2010-02-09 03:51:42 +00:00
|
|
|
# but doing so generated noise when ldconfig was rerun (rhbz:562980)
|
2010-02-08 20:41:07 +00:00
|
|
|
#
|
|
|
|
%if 0%{?with_gdb_hooks}
|
2010-02-09 03:51:42 +00:00
|
|
|
mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_libdir}
|
|
|
|
cp libpython/libpython.py %{buildroot}%{_prefix}/lib/debug/%{_libdir}/%{py_INSTSONAME}.debug-gdb.py
|
2010-02-08 20:41:07 +00:00
|
|
|
%endif # with_gdb_hooks
|
|
|
|
|
2010-02-12 21:38:52 +00:00
|
|
|
#
|
|
|
|
# Systemtap hooks:
|
|
|
|
#
|
|
|
|
%if 0%{?with_systemtap}
|
|
|
|
# Install a tapset for this libpython into tapsetdir, fixing up the path to the
|
|
|
|
# library:
|
|
|
|
mkdir -p %{buildroot}%{tapsetdir}
|
|
|
|
%ifarch ppc64 s390x x86_64 ia64 alpha sparc64
|
|
|
|
%global libpython_stp libpython%{pybasever}-64.stp
|
|
|
|
%else
|
|
|
|
%global libpython_stp libpython%{pybasever}-32.stp
|
|
|
|
%endif
|
|
|
|
|
|
|
|
sed \
|
|
|
|
-e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME}|" \
|
|
|
|
%{SOURCE5} \
|
|
|
|
> %{buildroot}%{tapsetdir}/%{libpython_stp}
|
|
|
|
%endif # with_systemtap
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
%check
|
|
|
|
# Run the upstream test suite, using the "runtests.sh" harness from the upstream
|
|
|
|
# tarball.
|
|
|
|
# I'm seeing occasional hangs in "test_httplib" when running the test suite inside
|
|
|
|
# Koji. For that reason I exclude that one.
|
|
|
|
LD_LIBRARY_PATH=$(pwd) ./runtests.sh -x test_httplib
|
|
|
|
|
|
|
|
# Note that we're running the tests using the version of the code in the builddir,
|
|
|
|
# not in the buildroot.
|
|
|
|
|
|
|
|
# The harness only emits the names of the test scripts it ran, along with a
|
|
|
|
# summary of the form:
|
|
|
|
# 2 BAD
|
|
|
|
# 313 GOOD
|
|
|
|
# 22 SKIPPED
|
|
|
|
# 337 total
|
|
|
|
# As a byproduct it writes files "GOOD", "BAD", "SKIPPED", listing names of
|
|
|
|
# files (e.g. "test_imp") along with a subdirectory OUT containing files of the
|
|
|
|
# form $TEST.out
|
|
|
|
# Each such logfile starts with a line indicating the name of the test
|
|
|
|
|
|
|
|
# Output the logs from failing tests, so that they are captured in the rpmbuild
|
|
|
|
# log:
|
|
|
|
for TESTNAME in $(cat BAD); do
|
|
|
|
cat OUT/$TESTNAME.out ;
|
|
|
|
done
|
|
|
|
|
|
|
|
# There are 5 expected BAD results here:
|
|
|
|
#
|
|
|
|
# (1) test_distutils.py: tries to build an RPM inside the rpmbuild; I'll simply
|
|
|
|
# let this one fail for now (has trouble linking against -lpython3.1; perhaps
|
|
|
|
# LD_LIBRARY_PATH is being discarded somewhere?)
|
|
|
|
#
|
|
|
|
# (2) test_imp.py: ImportTests.test_issue1267 in test_imp.py reads pydoc.py's
|
|
|
|
# shebang line and checks that it read it correctly.tests that the shebang line
|
|
|
|
# is as expected. Unfortunately if we patch this up in the buildir (in the
|
|
|
|
# build phase), then the "make install" will try to reference
|
|
|
|
# /usr/bin/python%{pybasever} which won't exist on a clean build environment.
|
|
|
|
# So we fix up the shebang lines after this in the install phase, and expect
|
|
|
|
# this test to fail in the check phase. It ought to pass when run on the built
|
|
|
|
# RPMs
|
|
|
|
#
|
|
|
|
# (3) test_socket.py:testSockName can fail here if DNS isn't properly set up:
|
|
|
|
# my_ip_addr = socket.gethostbyname(socket.gethostname())
|
|
|
|
# socket.gaierror: [Errno -2] Name or service not known
|
|
|
|
#
|
|
|
|
# (4) test_subprocess: merely get "errors occurred"
|
|
|
|
#
|
|
|
|
# (5) test_telnet: can get a "socket.error: [Errno 104] Connection reset by peer"
|
|
|
|
#
|
|
|
|
# Some additional tests fail when running the test suite as non-root outside of
|
|
|
|
# the build, due to permissions issues.
|
|
|
|
|
|
|
|
%clean
|
|
|
|
rm -fr $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
%post libs -p /sbin/ldconfig
|
|
|
|
|
|
|
|
%postun libs -p /sbin/ldconfig
|
|
|
|
|
2010-01-28 19:09:18 +00:00
|
|
|
%files
|
2010-01-13 21:25:18 +00:00
|
|
|
%defattr(-, root, root)
|
|
|
|
%doc LICENSE README
|
|
|
|
%{_bindir}/pydoc*
|
|
|
|
%{_bindir}/python3
|
|
|
|
%{_bindir}/python%{pybasever}
|
|
|
|
%{_mandir}/*/*
|
|
|
|
%dir %{pylibdir}
|
2010-01-28 19:09:18 +00:00
|
|
|
%dir %{dynload_dir}
|
|
|
|
%{dynload_dir}/Python-%{version}-py%{pybasever}.egg-info
|
|
|
|
%{dynload_dir}/_bisectmodule.so
|
|
|
|
%{dynload_dir}/_codecs_cn.so
|
|
|
|
%{dynload_dir}/_codecs_hk.so
|
|
|
|
%{dynload_dir}/_codecs_iso2022.so
|
|
|
|
%{dynload_dir}/_codecs_jp.so
|
|
|
|
%{dynload_dir}/_codecs_kr.so
|
|
|
|
%{dynload_dir}/_codecs_tw.so
|
|
|
|
%{dynload_dir}/_collectionsmodule.so
|
|
|
|
%{dynload_dir}/_csv.so
|
|
|
|
%{dynload_dir}/_ctypes.so
|
|
|
|
%{dynload_dir}/_curses.so
|
|
|
|
%{dynload_dir}/_curses_panel.so
|
|
|
|
%{dynload_dir}/_dbm.so
|
|
|
|
%{dynload_dir}/_elementtree.so
|
|
|
|
%{dynload_dir}/_gdbmmodule.so
|
|
|
|
%{dynload_dir}/_hashlib.so
|
|
|
|
%{dynload_dir}/_heapqmodule.so
|
|
|
|
%{dynload_dir}/_json.so
|
|
|
|
%{dynload_dir}/_lsprof.so
|
|
|
|
%{dynload_dir}/_multibytecodecmodule.so
|
|
|
|
%{dynload_dir}/_multiprocessing.so
|
|
|
|
%{dynload_dir}/_pickle.so
|
|
|
|
%{dynload_dir}/_randommodule.so
|
|
|
|
%{dynload_dir}/_sha1module.so
|
|
|
|
%{dynload_dir}/_sha256module.so
|
|
|
|
%{dynload_dir}/_sha512module.so
|
|
|
|
%{dynload_dir}/_socketmodule.so
|
|
|
|
%{dynload_dir}/_sqlite3.so
|
|
|
|
%{dynload_dir}/_ssl.so
|
|
|
|
%{dynload_dir}/_struct.so
|
|
|
|
%{dynload_dir}/_weakref.so
|
|
|
|
%{dynload_dir}/arraymodule.so
|
|
|
|
%{dynload_dir}/atexitmodule.so
|
|
|
|
%{dynload_dir}/audioop.so
|
|
|
|
%{dynload_dir}/binascii.so
|
|
|
|
%{dynload_dir}/bz2.so
|
|
|
|
%{dynload_dir}/cmathmodule.so
|
|
|
|
%{dynload_dir}/cryptmodule.so
|
|
|
|
%{dynload_dir}/datetime.so
|
|
|
|
%{dynload_dir}/fcntlmodule.so
|
|
|
|
%{dynload_dir}/grpmodule.so
|
|
|
|
%{dynload_dir}/itertoolsmodule.so
|
|
|
|
%{dynload_dir}/mathmodule.so
|
|
|
|
%{dynload_dir}/mmapmodule.so
|
|
|
|
%{dynload_dir}/nismodule.so
|
|
|
|
%{dynload_dir}/operator.so
|
|
|
|
%{dynload_dir}/ossaudiodev.so
|
|
|
|
%{dynload_dir}/parsermodule.so
|
|
|
|
%{dynload_dir}/pyexpat.so
|
|
|
|
%{dynload_dir}/readline.so
|
|
|
|
%{dynload_dir}/resource.so
|
|
|
|
%{dynload_dir}/selectmodule.so
|
|
|
|
%{dynload_dir}/spwdmodule.so
|
|
|
|
%{dynload_dir}/syslogmodule.so
|
|
|
|
%{dynload_dir}/termios.so
|
|
|
|
%{dynload_dir}/timemodule.so
|
|
|
|
%{dynload_dir}/unicodedata.so
|
|
|
|
%{dynload_dir}/xxsubtype.so
|
|
|
|
%{dynload_dir}/zlibmodule.so
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
%dir %{pylibdir}/site-packages
|
|
|
|
%{pylibdir}/site-packages/README
|
|
|
|
%{pylibdir}/*.py*
|
|
|
|
%{pylibdir}/*.doc
|
|
|
|
%{pylibdir}/wsgiref.egg-info
|
|
|
|
%dir %{pylibdir}/ctypes
|
|
|
|
%{pylibdir}/ctypes/*.py*
|
|
|
|
%{pylibdir}/ctypes/macholib
|
|
|
|
%{pylibdir}/curses
|
|
|
|
%dir %{pylibdir}/dbm
|
|
|
|
%{pylibdir}/dbm/*.py*
|
|
|
|
%dir %{pylibdir}/distutils
|
|
|
|
%{pylibdir}/distutils/*.py*
|
|
|
|
%{pylibdir}/distutils/README
|
|
|
|
%{pylibdir}/distutils/command
|
|
|
|
%dir %{pylibdir}/email
|
|
|
|
%{pylibdir}/email/*.py*
|
|
|
|
%{pylibdir}/email/mime
|
|
|
|
%{pylibdir}/encodings
|
|
|
|
%{pylibdir}/html
|
|
|
|
%{pylibdir}/http
|
|
|
|
%{pylibdir}/idlelib
|
|
|
|
%dir %{pylibdir}/importlib
|
|
|
|
%{pylibdir}/importlib/*.py*
|
|
|
|
%dir %{pylibdir}/json
|
|
|
|
%{pylibdir}/json/*.py*
|
2010-01-20 16:01:25 +00:00
|
|
|
%{pylibdir}/lib2to3
|
|
|
|
%exclude %{pylibdir}/lib2to3/tests
|
2010-01-13 21:25:18 +00:00
|
|
|
%{pylibdir}/logging
|
|
|
|
%{pylibdir}/multiprocessing
|
|
|
|
%{pylibdir}/plat-linux2
|
|
|
|
%{pylibdir}/pydoc_data
|
|
|
|
%dir %{pylibdir}/sqlite3
|
|
|
|
%{pylibdir}/sqlite3/*.py*
|
|
|
|
%dir %{pylibdir}/test
|
|
|
|
%{pylibdir}/test/__init__.py*
|
|
|
|
%{pylibdir}/urllib
|
|
|
|
%{pylibdir}/wsgiref
|
|
|
|
%{pylibdir}/xml
|
|
|
|
%{pylibdir}/xmlrpc
|
|
|
|
%if "%{_lib}" == "lib64"
|
2010-01-13 22:33:42 +00:00
|
|
|
%attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}
|
|
|
|
%attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}/site-packages
|
2010-01-13 21:25:18 +00:00
|
|
|
%endif
|
|
|
|
|
|
|
|
# "Makefile" and the config-32/64.h file are needed by
|
|
|
|
# distutils/sysconfig.py:_init_posix(), so we include them in the core
|
|
|
|
# package, along with their parent directories (bug 531901):
|
|
|
|
%dir %{pylibdir}/config
|
|
|
|
%{pylibdir}/config/Makefile
|
2010-01-13 22:33:42 +00:00
|
|
|
%dir %{_includedir}/python%{pybasever}
|
|
|
|
%{_includedir}/python%{pybasever}/%{_pyconfig_h}
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
%files libs
|
|
|
|
%defattr(-,root,root,-)
|
2010-02-09 03:51:42 +00:00
|
|
|
%{_libdir}/%{py_INSTSONAME}
|
2010-02-12 21:38:52 +00:00
|
|
|
%if 0%{?with_systemtap}
|
|
|
|
%{tapsetdir}/%{libpython_stp}
|
|
|
|
%doc systemtap-example.stp
|
|
|
|
%endif
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
%files devel
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%{pylibdir}/config/*
|
|
|
|
%exclude %{pylibdir}/config/Makefile
|
|
|
|
/usr/include/python%{pybasever}/*.h
|
|
|
|
%exclude /usr/include/python%{pybasever}/%{_pyconfig_h}
|
|
|
|
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
|
|
|
|
%{_bindir}/python3-config
|
|
|
|
%{_bindir}/python%{pybasever}-config
|
|
|
|
%{_libdir}/libpython%{pybasever}.so
|
|
|
|
%{_libdir}/pkgconfig/python*.pc
|
|
|
|
%config(noreplace) %{_sysconfdir}/rpm/macros.python3
|
2010-01-28 19:09:18 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/rpm/macros.pybytecompile
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
%files tools
|
|
|
|
%defattr(-,root,root,755)
|
2010-01-28 19:09:18 +00:00
|
|
|
%{_bindir}/python3-2to3
|
2010-01-13 21:25:18 +00:00
|
|
|
%{_bindir}/idle*
|
|
|
|
%{pylibdir}/Tools
|
|
|
|
%doc %{pylibdir}/Demo
|
|
|
|
%exclude %{pylibdir}/Demo/distutils
|
|
|
|
%exclude %{pylibdir}/Demo/md5test
|
|
|
|
%doc %{pylibdir}/Doc
|
|
|
|
|
|
|
|
%files tkinter
|
|
|
|
%defattr(-,root,root,755)
|
|
|
|
%{pylibdir}/tkinter
|
|
|
|
%exclude %{pylibdir}/tkinter/test
|
2010-01-28 19:09:18 +00:00
|
|
|
%{dynload_dir}/_tkinter.so
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
%files test
|
|
|
|
%defattr(-, root, root)
|
|
|
|
%{pylibdir}/ctypes/test
|
|
|
|
%{pylibdir}/distutils/tests
|
|
|
|
%{pylibdir}/email/test
|
|
|
|
%{pylibdir}/importlib/test
|
|
|
|
%{pylibdir}/json/tests
|
|
|
|
%{pylibdir}/sqlite3/test
|
|
|
|
%{pylibdir}/test
|
2010-01-28 19:09:18 +00:00
|
|
|
%{dynload_dir}/_ctypes_test.so
|
|
|
|
%{dynload_dir}/_testcapimodule.so
|
2010-01-13 21:25:18 +00:00
|
|
|
%{pylibdir}/lib2to3/tests
|
|
|
|
%doc %{pylibdir}/Demo/distutils
|
|
|
|
%doc %{pylibdir}/Demo/md5test
|
|
|
|
%{pylibdir}/tkinter/test
|
|
|
|
|
2010-02-09 03:51:42 +00:00
|
|
|
# We put the debug-gdb.py file inside /usr/lib/debug to avoid noise from
|
|
|
|
# ldconfig (rhbz: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
|
|
|
|
#
|
|
|
|
# Hence by installing it below /usr/lib/debug we ensure it is added to the
|
|
|
|
# -debuginfo subpackage
|
|
|
|
# (if it doesn't, then the rpmbuild ought to fail since the debug-gdb.py
|
|
|
|
# payload file would be unpackaged)
|
|
|
|
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
%changelog
|
2010-02-12 21:38:52 +00:00
|
|
|
* Fri Feb 12 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-25
|
|
|
|
- split configure options into multiple lines for easy of editing
|
|
|
|
- add systemtap static markers (wcohen, mjw, dmalcolm; patch 8), a systemtap
|
|
|
|
tapset defining "python.function.entry" and "python.function.return" to make
|
|
|
|
the markers easy to use (dmalcolm; source 5), and an example of using the
|
|
|
|
tapset to the docs (dmalcolm; source 6) (rhbz:545179)
|
|
|
|
|
2010-02-09 03:51:42 +00:00
|
|
|
* Mon Feb 8 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-24
|
|
|
|
- move the -gdb.py file from %%{_libdir}/INSTSONAME-gdb.py to
|
|
|
|
%%{_prefix}/lib/debug/%%{_libdir}/INSTSONAME.debug-gdb.py to avoid noise from
|
|
|
|
ldconfig (bug 562980), and which should also ensure it becomes part of the
|
|
|
|
debuginfo subpackage, rather than the libs subpackage
|
|
|
|
- introduce %%{py_SOVERSION} and %%{py_INSTSONAME} to reflect the upstream
|
|
|
|
configure script, and to avoid fragile scripts that try to figure this out
|
|
|
|
dynamically (e.g. for the -gdb.py change)
|
|
|
|
|
2010-02-08 20:41:07 +00:00
|
|
|
* Mon Feb 8 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-23
|
|
|
|
- add gdb hooks for easier debugging (Source 4)
|
|
|
|
|
2010-01-28 19:56:39 +00:00
|
|
|
* Thu Jan 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-22
|
|
|
|
- update python-3.1.1-config.patch to remove downstream customization of build
|
|
|
|
of pyexpat and elementtree modules
|
|
|
|
- add patch adapted from upstream (patch 7) to add support for building against
|
|
|
|
system expat; add --with-system-expat to "configure" invocation
|
|
|
|
- remove embedded copies of expat and zlib from source tree during "prep"
|
|
|
|
|
2010-01-28 19:09:18 +00:00
|
|
|
* Mon Jan 25 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-21
|
|
|
|
- introduce %%{dynload_dir} macro
|
|
|
|
- explicitly list all lib-dynload files, rather than dynamically gathering the
|
|
|
|
payload into a temporary text file, so that we can be sure what we are
|
|
|
|
shipping
|
|
|
|
- introduce a macros.pybytecompile source file, to help with packaging python3
|
|
|
|
modules (Source3; written by Toshio)
|
|
|
|
- rename "2to3-3" to "python3-2to3" to better reflect python 3 module packaging
|
|
|
|
plans
|
|
|
|
|
2010-01-25 18:44:42 +00:00
|
|
|
* Mon Jan 25 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-20
|
|
|
|
- change python-3.1.1-config.patch to remove our downstream change to curses
|
|
|
|
configuration in Modules/Setup.dist, so that the curses modules are built using
|
|
|
|
setup.py with the downstream default (linking against libncursesw.so, rather
|
|
|
|
than libncurses.so), rather than within the Makefile; add a test to %%install
|
|
|
|
to verify the dso files that the curses module is linked against the correct
|
|
|
|
DSO (bug 539917; changes _cursesmodule.so -> _curses.so)
|
|
|
|
|
2010-01-22 22:00:30 +00:00
|
|
|
* Fri Jan 22 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-19
|
|
|
|
- add %%py3dir macro to macros.python3 (to be used during unified python 2/3
|
|
|
|
builds for setting up the python3 copy of the source tree)
|
|
|
|
|
2010-01-20 16:01:25 +00:00
|
|
|
* Wed Jan 20 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-18
|
|
|
|
- move lib2to3 from -tools subpackage to main package (bug 556667)
|
|
|
|
|
2010-01-18 17:59:07 +00:00
|
|
|
* Sun Jan 17 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-17
|
|
|
|
- patch Makefile.pre.in to avoid building static library (patch 6, bug 556092)
|
|
|
|
|
2010-01-16 01:20:39 +00:00
|
|
|
* Fri Jan 15 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-16
|
|
|
|
- use the %%{_isa} macro to ensure that the python-devel dependency on python
|
|
|
|
is for the correct multilib arch (#555943)
|
|
|
|
- delete bundled copy of libffi to make sure we use the system one
|
|
|
|
|
2010-01-15 21:08:54 +00:00
|
|
|
* Fri Jan 15 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-15
|
|
|
|
- fix the URLs output by pydoc so they point at python.org's 3.1 build of the
|
|
|
|
docs, rather than the 2.6 build
|
|
|
|
|
2010-01-13 22:33:42 +00:00
|
|
|
* Wed Jan 13 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-14
|
|
|
|
- replace references to /usr with %%{_prefix}; replace references to
|
|
|
|
/usr/include with %%{_includedir} (Toshio)
|
|
|
|
|
2010-01-13 21:25:18 +00:00
|
|
|
* Mon Jan 11 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-13
|
|
|
|
- fix permission on find-provides-without-python-sonames.sh from 775 to 755
|
|
|
|
|
|
|
|
* Mon Jan 11 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-12
|
|
|
|
- remove build-time requirements on tix and tk, since we already have
|
|
|
|
build-time requirements on the -devel subpackages for each of these (Thomas
|
|
|
|
Spura)
|
|
|
|
- replace usage of %%define with %%global (Thomas Spura)
|
|
|
|
- remove forcing of CC=gcc as this old workaround for bug 109268 appears to
|
|
|
|
longer be necessary
|
|
|
|
- move various test files from the "tools"/"tkinter" subpackages to the "test"
|
|
|
|
subpackage
|
|
|
|
|
|
|
|
* Thu Jan 7 2010 David Malcolm <dmalcolm@redhat.com> - 3.1.1-11
|
|
|
|
- add %%check section (thanks to Thomas Spura)
|
|
|
|
- update patch 4 to use correct shebang line
|
|
|
|
- get rid of stray patch file from buildroot
|
|
|
|
|
|
|
|
* Tue Nov 17 2009 Andrew McNabb <amcnabb@mcnabbs.org> - 3.1.1-10
|
|
|
|
- switched a few instances of "find |xargs" to "find -exec" for consistency.
|
|
|
|
- made the description of __os_install_post more accurate.
|
|
|
|
|
|
|
|
* Wed Nov 4 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-9
|
|
|
|
- add macros.python3 to the -devel subpackage, containing common macros for use
|
|
|
|
when packaging python3 modules
|
|
|
|
|
|
|
|
* Tue Nov 3 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-8
|
|
|
|
- add a provides of "python(abi)" (see bug 532118)
|
|
|
|
- fix issues identified by a.badger in package review (bug 526126, comment 39):
|
|
|
|
- use "3" thoughout metadata, rather than "3.*"
|
|
|
|
- remove conditional around "pkg-config openssl"
|
|
|
|
- use standard cleanup of RPM_BUILD_ROOT
|
|
|
|
- replace hardcoded references to /usr with _prefix macro
|
|
|
|
- stop removing egg-info files
|
|
|
|
- use /usr/bin/python3.1 rather than /use/bin/env python3.1 when fixing
|
|
|
|
up shebang lines
|
|
|
|
- stop attempting to remove no-longer-present .cvsignore files
|
|
|
|
- move the post/postun sections above the "files" sections
|
|
|
|
|
|
|
|
* Thu Oct 29 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-7
|
|
|
|
- remove commented-away patch 51 (python-2.6-distutils_rpm.patch): the -O1
|
|
|
|
flag is used by default in the upstream code
|
|
|
|
- "Makefile" and the config-32/64.h file are needed by distutils/sysconfig.py
|
|
|
|
_init_posix(), so we include them in the core package, along with their parent
|
|
|
|
directories (bug 531901)
|
|
|
|
|
|
|
|
* Tue Oct 27 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-6
|
|
|
|
- reword description, based on suggestion by amcnabb
|
|
|
|
- fix the test_email and test_imp selftests (patch 3 and patch 4 respectively)
|
|
|
|
- fix the test_tk and test_ttk_* selftests (patch 5)
|
|
|
|
- fix up the specfile's handling of shebang/perms to avoid corrupting
|
|
|
|
test_httpservers.py (sed command suggested by amcnabb)
|
|
|
|
|
|
|
|
* Thu Oct 22 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-5
|
|
|
|
- fixup importlib/_bootstrap.py so that it correctly handles being unable to
|
|
|
|
open .pyc files for writing (patch 2, upstream issue 7187)
|
|
|
|
- actually apply the rpath patch (patch 1)
|
|
|
|
|
|
|
|
* Thu Oct 22 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-4
|
|
|
|
- update patch0's setup of the crypt module to link it against libcrypt
|
|
|
|
- update patch0 to comment "datetimemodule" back out, so that it is built
|
|
|
|
using setup.py (see Setup, option 3), thus linking it statically against
|
|
|
|
timemodule.c and thus avoiding a run-time "undefined symbol:
|
|
|
|
_PyTime_DoubleToTimet" failure on "import datetime"
|
|
|
|
|
|
|
|
* Wed Oct 21 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-3
|
|
|
|
- remove executable flag from various files that shouldn't have it
|
|
|
|
- fix end-of-line encodings
|
|
|
|
- fix a character encoding
|
|
|
|
|
|
|
|
* Tue Oct 20 2009 David Malcolm <dmalcolm@redhat.com> - 3.1.1-2
|
|
|
|
- disable invocation of brp-python-bytecompile in postprocessing, since
|
|
|
|
it would be with the wrong version of python (adapted from ivazquez'
|
|
|
|
python3000 specfile)
|
|
|
|
- use a custom implementation of __find_provides in order to filter out bogus
|
|
|
|
provides lines for the various .so modules
|
|
|
|
- fixup distutils/unixccompiler.py to remove standard library path from rpath
|
|
|
|
(patch 1, was Patch0 in ivazquez' python3000 specfile)
|
|
|
|
- split out libraries into a -libs subpackage
|
|
|
|
- update summaries and descriptions, basing content on ivazquez' specfile
|
|
|
|
- fixup executable permissions on .py, .xpm and .xbm files, based on work in
|
|
|
|
ivazquez's specfile
|
|
|
|
- get rid of DOS batch files
|
|
|
|
- fixup permissions for shared libraries from non-standard 555 to standard 755
|
|
|
|
- move /usr/bin/python*-config to the -devel subpackage
|
|
|
|
- mark various directories as being documentation
|
|
|
|
|
|
|
|
* Thu Sep 24 2009 Andrew McNabb <amcnabb@mcnabbs.org> 3.1.1-1
|
|
|
|
- Initial package for Python 3.
|
|
|
|
|