Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at Fri Mar 25 14:12:38 CET 2011.
-------- --- python/python-base.changes 2011-01-17 10:42:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/python/python-base.changes 2011-02-17 17:47:41.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 17 17:37:09 CET 2011 - [email protected] + +- Prefix DATE and TIME with PY_BUILD_ and COMPILER with PYTHON_ as + to not break external code (bnc#673071). + +------------------------------------------------------------------- --- python/python.changes 2010-08-31 04:56:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python.changes 2011-02-17 17:47:41.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 17 17:37:09 CET 2011 - [email protected] + +- Prefix DATE and TIME with PY_BUILD_ and COMPILER with PYTHON_ as + to not break external code (bnc#673071). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- python-fix_date_time_compiler.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.8SSD92/_old 2011-03-25 11:51:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8SSD92/_new 2011-03-25 11:51:52.000000000 +0100 @@ -30,7 +30,7 @@ # Summary: Python Interpreter base package Version: 2.7 -Release: 5 +Release: 6 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -52,7 +52,7 @@ 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 @@ %patch10 %patch11 %patch12 -p0 +%patch13 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f @@ -168,10 +169,10 @@ # 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 ######################################## ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.8SSD92/_old 2011-03-25 11:51:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8SSD92/_new 2011-03-25 11:51:52.000000000 +0100 @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 5 +Release: 6 %define pyver 2.7 BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.8SSD92/_old 2011-03-25 11:51:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8SSD92/_new 2011-03-25 11:51:52.000000000 +0100 @@ -32,7 +32,7 @@ Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.7 -Release: 5 +Release: 11 Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} @@ -51,6 +51,7 @@ 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 @@ %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 @@ # 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 ######################################## ++++++ python-fix_date_time_compiler.patch ++++++ 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 <stdio.h> #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; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
