From 9e5dcb3d8b8fea13ce45fb133a682b42fd5ba2564ac12bb78b1d92db899bd103 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 17 Feb 2011 17:32:10 +0000 Subject: [PATCH] Accepting request 61639 from home:psmt:branches:devel:languages:python:Factory OBS-URL: https://build.opensuse.org/request/show/61639 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=92 --- python-base.changes | 6 +++ python-base.spec | 15 +++--- python-doc.spec | 6 +-- python-fix_date_time_compiler.patch | 80 +++++++++++++++++++++++++++++ python.changes | 6 +++ python.spec | 14 ++--- 6 files changed, 111 insertions(+), 16 deletions(-) create mode 100644 python-fix_date_time_compiler.patch diff --git a/python-base.changes b/python-base.changes index 0ecf0c7..c3d4803 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 17 17:37:09 CET 2011 - pth@suse.de + +- Prefix DATE and TIME with PY_BUILD_ and COMPILER with PYTHON_ as + to not break external code (bnc#673071). + ------------------------------------------------------------------- Mon Jan 17 09:42:20 UTC 2011 - coolo@novell.com diff --git a/python-base.spec b/python-base.spec index 4680285..a710217 100644 --- a/python-base.spec +++ b/python-base.spec @@ -1,7 +1,7 @@ # -# spec file for package python-base (Version 2.7) +# spec file for package python-base # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ Obsoletes: python-64bit # Summary: Python Interpreter base package Version: 2.7 -Release: 4 +Release: 5 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -52,7 +52,7 @@ Patch9: python-2.7-acrequire.patch Patch10: urllib2-AbstractBasicAuthHandler_reset_attr.diff Patch11: smtpd-dos.patch Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch - +Patch13: python-fix_date_time_compiler.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) Provides: %{name} = %{python_version} @@ -146,6 +146,7 @@ Authors: %patch10 %patch11 %patch12 -p0 +%patch13 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f @@ -168,10 +169,10 @@ autoreconf -f -i . # Modules/_ctypes/libffi # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h # use just gcc instead of [GCC 4.5.0 20100604 [gcc-4_5-branch revision 160292].. -echo '#define COMPILER "[GCC]"' >> pyconfig.h.in +echo '#define PYTHON_COMPILER "[GCC]"' >> pyconfig.h.in # use a compilation date equivalent to the source tarball. -printf '#define DATE "%s %s %s"\n' $(date -u -r %{SOURCE0} +"%b %d %Y") >> pyconfig.h.in -printf '#define TIME "%s"\n' $(date -u -r %{SOURCE0} +"%T") >> pyconfig.h.in +printf '#define PY_BUILD_DATE "%s %s %s"\n' $(date -u -r %{SOURCE0} +"%b %d %Y") >> pyconfig.h.in +printf '#define PY_BUILD_TIME "%s"\n' $(date -u -r %{SOURCE0} +"%T") >> pyconfig.h.in ######################################## # configure ######################################## diff --git a/python-doc.spec b/python-doc.spec index 8931f7c..27ce7a8 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -1,7 +1,7 @@ # -# spec file for package python-doc (Version 2.7) +# spec file for package python-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 4 +Release: 5 %define pyver 2.7 BuildArch: noarch %define tarname Python-%{pyver} diff --git a/python-fix_date_time_compiler.patch b/python-fix_date_time_compiler.patch new file mode 100644 index 0000000..a0c1ba9 --- /dev/null +++ b/python-fix_date_time_compiler.patch @@ -0,0 +1,80 @@ +Index: Modules/getbuildinfo.c +=================================================================== +--- Modules/getbuildinfo.c.orig 2010-05-09 16:46:46.000000000 +0200 ++++ Modules/getbuildinfo.c 2011-02-17 17:25:00.904694976 +0100 +@@ -4,19 +4,19 @@ + #include + #endif + +-#ifndef DATE +-#ifdef __DATE__ +-#define DATE __DATE__ ++#ifndef PY_BUILD_DATE ++#ifdef __PY_BUILD_DATE__ ++#define PY_BUILD_DATE __PY_BUILD_DATE__ + #else +-#define DATE "xx/xx/xx" ++#define PY_BUILD_DATE "xx/xx/xx" + #endif + #endif + +-#ifndef TIME +-#ifdef __TIME__ +-#define TIME __TIME__ ++#ifndef PY_BUILD_TIME ++#ifdef __PY_BUILD_TIME__ ++#define PY_BUILD_TIME __PY_BUILD_TIME__ + #else +-#define TIME "xx:xx:xx" ++#define PY_BUILD_TIME "xx:xx:xx" + #endif + #endif + +@@ -37,7 +37,7 @@ Py_GetBuildInfo(void) + const char *branch = Py_SubversionShortBranch(); + PyOS_snprintf(buildinfo, sizeof(buildinfo), + "%s%s%s, %.20s, %.9s", branch, sep, revision, +- DATE, TIME); ++ PY_BUILD_DATE, PY_BUILD_TIME); + return buildinfo; + } + +Index: Python/getcompiler.c +=================================================================== +--- Python/getcompiler.c.orig 2000-09-05 06:40:39.000000000 +0200 ++++ Python/getcompiler.c 2011-02-17 17:23:55.320858100 +0100 +@@ -3,26 +3,26 @@ + + #include "Python.h" + +-#ifndef COMPILER ++#ifndef PYTHON_COMPILER + + #ifdef __GNUC__ +-#define COMPILER "\n[GCC " __VERSION__ "]" ++#define PYTHON_COMPILER "\n[GCC " __VERSION__ "]" + #endif + +-#endif /* !COMPILER */ ++#endif /* !PYTHON_COMPILER */ + +-#ifndef COMPILER ++#ifndef PYTHON_COMPILER + + #ifdef __cplusplus +-#define COMPILER "[C++]" ++#define PYTHON_COMPILER "[C++]" + #else +-#define COMPILER "[C]" ++#define PYTHON_COMPILER "[C]" + #endif + +-#endif /* !COMPILER */ ++#endif /* !PYTHON_COMPILER */ + + const char * + Py_GetCompiler(void) + { +- return COMPILER; ++ return PYTHON_COMPILER; + } diff --git a/python.changes b/python.changes index 96f91a2..8132679 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 17 17:37:09 CET 2011 - pth@suse.de + +- Prefix DATE and TIME with PY_BUILD_ and COMPILER with PYTHON_ as + to not break external code (bnc#673071). + ------------------------------------------------------------------- Tue Aug 31 02:51:56 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/python.spec b/python.spec index 3292a5f..dfd92ae 100644 --- a/python.spec +++ b/python.spec @@ -1,7 +1,7 @@ # -# spec file for package python (Version 2.7) +# spec file for package python # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ Obsoletes: python-64bit Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.7 -Release: 4 +Release: 5 Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} @@ -51,6 +51,7 @@ Patch5: python-2.7rc2-configure.patch Patch6: python-2.6b3-curses-panel.patch Patch7: sparc_longdouble.patch Patch8: python-2.7-acrequire.patch +Patch9: python-fix_date_time_compiler.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) @@ -182,6 +183,7 @@ Authors: %patch6 %patch7 -p1 %patch8 -p1 +%patch9 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf @@ -203,10 +205,10 @@ autoreconf -f -i . # Modules/_ctypes/libffi # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h # use just gcc instead of [GCC 4.5.0 20100604 [gcc-4_5-branch revision 160292].. -echo '#define COMPILER "[GCC]"' >> pyconfig.h.in +echo '#define PYTHON_COMPILER "[GCC]"' >> pyconfig.h.in # use a compilation date equivalent to the source tarball. -printf '#define DATE "%s %s %s"\n' $(date -u -r %{SOURCE0} +"%b %d %Y") >> pyconfig.h.in -printf '#define TIME "%s"\n' $(date -u -r %{SOURCE0} +"%T") >> pyconfig.h.in +printf '#define PY_BUILD_DATE "%s %s %s"\n' $(date -u -r %{SOURCE0} +"%b %d %Y") >> pyconfig.h.in +printf '#define PY_BUILD_TIME "%s"\n' $(date -u -r %{SOURCE0} +"%T") >> pyconfig.h.in ######################################## # configure ########################################