From f1a853c81b8f8221bc62c8d07f8f70f053059e065f4d5462b38fd1542056c26e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 21 Sep 2010 16:04:31 +0000 Subject: [PATCH] Accepting request 48686 from devel:languages:python:Factory checked in (request 48686) OBS-URL: https://build.opensuse.org/request/show/48686 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=84 --- baselibs.conf | 2 +- python-base.changes | 5 ----- python-base.spec | 9 ++------- python-doc.spec | 4 ++-- python.changes | 9 --------- python.spec | 17 +++++++---------- 6 files changed, 12 insertions(+), 34 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 7084230..511e885 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ python requires "python-base- = " python-base -libpython2_7-1_0 +libpython2_6-1_0 diff --git a/python-base.changes b/python-base.changes index 3c0bad4..d2af42f 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 e768578..614a0cf 100644 --- a/python-base.spec +++ b/python-base.spec @@ -1,5 +1,5 @@ # -# spec file for package python-base (Version 2.6.5) +# spec file for package python-base (Version 2.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: python-base -BuildRequires: zlib-devel fdupes pkg-config +BuildRequires: fdupes pkg-config zlib-devel Url: http://www.python.org/ License: MIT License (or similar) Group: Development/Languages/Python @@ -160,11 +160,6 @@ 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 09e9430..a045281 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -1,5 +1,5 @@ # -# spec file for package python-doc (Version 2.6) +# spec file for package python-doc (Version 2.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.7 -Release: 23 +Release: 1 %define pyver 2.7 BuildArch: noarch %define tarname Python-%{pyver} diff --git a/python.changes b/python.changes index 96f91a2..7a9d9e3 100644 --- a/python.changes +++ b/python.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -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 caa3e7b..478f259 100644 --- a/python.spec +++ b/python.spec @@ -1,5 +1,5 @@ # -# spec file for package python (Version 2.6.5) +# spec file for package python (Version 2.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: python -BuildRequires: db-devel gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel fdupes +BuildRequires: db-devel fdupes gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel #Requires: openssl >= 0.9.8e Url: http://www.python.org/ License: MIT License (or similar) @@ -32,7 +32,7 @@ Obsoletes: python-64bit Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.7 -Release: 2 +Release: 1 Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} @@ -202,11 +202,6 @@ 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 ######################################## @@ -385,9 +380,11 @@ install -m 644 %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/profile.d %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +%{run_ldconfig} -%postun -p /sbin/ldconfig +%postun +%{run_ldconfig} %files idle %defattr(644, root, root, 755)