From 424f25ca419257ce80f552c1a4ed6c52573da96d6c5242dedad56d03f47d4ce9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 21 Sep 2010 16:04:32 +0000 Subject: [PATCH] Accepting request 48686 from devel:languages:python:Factory Copy from devel:languages:python:Factory/python based on submit request 48686 from user coolo OBS-URL: https://build.opensuse.org/request/show/48686 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=53 --- baselibs.conf | 2 +- python-base.changes | 5 +++++ python-base.spec | 7 ++++++- python-doc.spec | 2 +- python.changes | 9 +++++++++ python.spec | 13 ++++++++----- 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 511e885..7084230 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ python requires "python-base- = " python-base -libpython2_6-1_0 +libpython2_7-1_0 diff --git a/python-base.changes b/python-base.changes index d2af42f..3c0bad4 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 21 10:07:43 UTC 2010 - coolo@novell.com + +- fix baselibs.conf + ------------------------------------------------------------------- Thu Aug 26 15:13:49 UTC 2010 - suse-tux@gmx.de diff --git a/python-base.spec b/python-base.spec index 614a0cf..cd59479 100644 --- a/python-base.spec +++ b/python-base.spec @@ -30,7 +30,7 @@ Obsoletes: python-64bit # Summary: Python Interpreter base package Version: 2.7 -Release: 1 +Release: 2 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -160,6 +160,11 @@ autoreconf -f -i . # Modules/_ctypes/libffi # prevent make from trying to rebuild asdl stuff, which requires existing # 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 +# 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 ######################################## # configure ######################################## diff --git a/python-doc.spec b/python-doc.spec index a045281..6d8bdff 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -24,7 +24,7 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 1 +Release: 2 %define pyver 2.7 BuildArch: noarch %define tarname Python-%{pyver} diff --git a/python.changes b/python.changes index 7a9d9e3..96f91a2 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 31 02:51:56 UTC 2010 - cristian.rodriguez@opensuse.org + +- Provide "fake" build enviroment information +* build date replaced by source tarball modify date +* compiler string replaced by "GCC" +* This is intended to avoid republishing the packages + over and over again. + ------------------------------------------------------------------- Thu Aug 26 11:42:44 UTC 2010 - jmatejek@novell.com diff --git a/python.spec b/python.spec index 478f259..e0c4679 100644 --- a/python.spec +++ b/python.spec @@ -32,7 +32,7 @@ Obsoletes: python-64bit Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.7 -Release: 1 +Release: 2 Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} @@ -202,6 +202,11 @@ autoreconf -f -i . # Modules/_ctypes/libffi # prevent make from trying to rebuild asdl stuff, which requires existing # 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 +# 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 ######################################## # configure ######################################## @@ -380,11 +385,9 @@ install -m 644 %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/profile.d %clean rm -rf $RPM_BUILD_ROOT -%post -%{run_ldconfig} +%post -p /sbin/ldconfig -%postun -%{run_ldconfig} +%postun -p /sbin/ldconfig %files idle %defattr(644, root, root, 755)