Accepting request 79616 from home:dirkmueller:branches:devel:languages:python:Factory

- update to 2.7.2:
  * Bug fix only release, see
  http://hg.python.org/cpython/raw-file/eb3c9b74884c/Misc/NEWS
  for details
- introduce a pre_checkin.sh file that synchronizes
  patches between python and python-base
- rediff patches for 2.7.2
- replace kernel3 patch with the upstream solution
- update to 2.7.2:
  * Bug fix only release, see
  http://hg.python.org/cpython/raw-file/eb3c9b74884c/Misc/NEWS
  for details
- introduce a pre_checkin.sh file that synchronizes
  patches between python and python-base
- rediff patches for 2.7.2
- replace kernel3 patch with the upstream solution

OBS-URL: https://build.opensuse.org/request/show/79616
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=105

python-base.spec

@@ -29,8 +29,8 @@ Obsoletes:      python-64bit
 %endif
 #
 Summary:        Python Interpreter base package
-Version:        2.7.1
-Release:        5
+Version:        2.7.2
+Release:        1
 %define         tarversion      %{version}
 %define         tarname         Python-%{tarversion}
 Source0:        %{tarname}.tar.bz2
@@ -39,21 +39,22 @@ Source2:        baselibs.conf
 Source3:        README.SUSE
 Source4:        distutils.cfg
 Source5:        _local.pth
-
+# COMMON-PATCH-BEGIN
 Patch1:         python-2.7-dirs.patch
 Patch2:         python-distutils-rpm-8.patch
-Patch3:         python-2.7.1-multilib.patch
-Patch4:         python-2.7rc2-canonicalize2.patch
-Patch5:         python-2.7rc2-configure.patch
-Patch6:         python-2.6-gettext-plurals.patch
-Patch7:         python-2.7.1-distutils_test_path.patch
-Patch8:         sparc_longdouble.patch
+Patch3:         python-2.7.2-multilib.patch
+Patch4:         python-2.5.1-sqlite.patch
+Patch5:         python-2.7rc2-canonicalize2.patch
+Patch6:         python-2.7rc2-configure.patch
+Patch7:         python-2.6-gettext-plurals.patch
+Patch8:         python-2.6b3-curses-panel.patch
+Patch9:         python-2.7.1-distutils_test_path.patch
+Patch10:         sparc_longdouble.patch
+Patch11:        python-2.7.2-linux3.patch
 Patch12:        http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch
-Patch13:        python-2.7.1-fix_date_time_compiler.patch
-Patch14:        python-2.7-CVE-2011-1521-fileurl.patch
-Patch15:        python-2.7-fix-parallel-make.patch
-Patch16:        python-2.7.1-linux3.patch
-Patch17:        python-2.7.1-urllib-noproxy.patch
+Patch13:        python-2.7.2-fix_date_time_compiler.patch
+Patch14:        python-2.7.1-urllib-noproxy.patch
+# COMMON-PATCH-END
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 Provides:       %{name} = %{python_version}
@@ -138,20 +139,22 @@ Authors:
 %prep
 %setup -q -n %{tarname}
 # patching
+# COMMON-PREP-BEGIN
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+%patch3
 %patch4
 %patch5
 %patch6
-%patch7 -p1
-%patch8 -p1
+%patch7
+%patch8
+%patch9 -p1
+%patch10 -p1
+%patch11
 %patch12
-%patch13 -p1
+%patch13
 %patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
+# COMMON-PREP-END
 
 # drop Autoconf version requirement
 sed -i 's/^version_required/dnl version_required/' configure.in
@@ -164,9 +167,6 @@ autoreconf -f -i . # Modules/_ctypes/libffi
 # provide a stable timestamp
 touch -r %{S:0} Makefile.pre.in
 
-# Cheat for kernel 3.0
-cp -r Lib/plat-linux2 Lib/plat-linux3
-
 # prevent make from trying to rebuild asdl stuff, which requires existing
 # python installation
 touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
@@ -248,7 +248,7 @@ rm -f $CLEANUP_DIR/lib-dynload/imageop.so
 rm -f $CLEANUP_DIR/lib-dynload/audioop.so
 # remove various things that don't need to be in python-base
 rm $RPM_BUILD_ROOT%{_bindir}/idle
-rm -r $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3}
+rm -rf $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3}
 rm $CLEANUP_DIR/ssl.py*
 #        does not work without _ssl.so anyway
 # replace duplicate .pyo/.pyc with hardlinks