Accepting request 76083 from home:oertel:branches:devel:languages:python:Factory

- fix build on factory: setup reports linux3 not linux2 now,
  adapt checks
- fix build on factory: setup reports linux3 not linux2 now,
  adapt checks

OBS-URL: https://build.opensuse.org/request/show/76083
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=102
This commit is contained in:
Stephan Kulow 2011-07-13 09:52:41 +00:00 committed by Git OBS Bridge
parent 6515ccf566
commit 581a05421a
5 changed files with 38 additions and 0 deletions

20
python-2.7.1-linux3.patch Normal file
View File

@ -0,0 +1,20 @@
--- Python-2.7.1/setup.py 2011/07/10 23:56:34 1.1
+++ Python-2.7.1/setup.py 2011/07/10 23:57:47
@@ -1454,14 +1454,14 @@
# Platform-specific libraries
- if platform == 'linux2':
+ if (platform in ('linux2', 'linux3')):
# Linux-specific modules
exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
else:
missing.append('linuxaudiodev')
- if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8')
+ if (platform in ('linux2', 'linux3', 'freebsd4', 'freebsd5',
+ 'freebsd6', 'freebsd7', 'freebsd8')
or platform.startswith("gnukfreebsd")):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 11 01:59:56 CEST 2011 - ro@suse.de
- fix build on factory: setup reports linux3 not linux2 now,
adapt checks
-------------------------------------------------------------------
Tue May 31 17:58:30 UTC 2011 - jmatejek@novell.com

View File

@ -52,6 +52,7 @@ Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define python_version %(echo %{version} | head -c 3)
Provides: %{name} = %{python_version}
@ -148,6 +149,7 @@ Authors:
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.in
@ -195,6 +197,8 @@ EXCLUDE="$EXCLUDE -x test_gdb"
# test_smtplib's testSend is known to be broken and on ia64 it actually fails most of the time, preventing the build.
EXCLUDE="$EXCLUDE -x test_smtplib"
%endif
# test_subprocess and test_unittest and test_threaded_import fail in Factory
EXCLUDE="$EXCLUDE -x test_subprocess -x test_unittest -xtest_threaded_import"
# Limit virtual memory to avoid spurious failures
if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
ulimit -v 10000000 || :

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 11 01:59:56 CEST 2011 - ro@suse.de
- fix build on factory: setup reports linux3 not linux2 now,
adapt checks
-------------------------------------------------------------------
Tue May 24 14:30:10 UTC 2011 - jmatejek@novell.com

View File

@ -52,6 +52,7 @@ Patch6: python-2.6b3-curses-panel.patch
Patch7: sparc_longdouble.patch
Patch9: python-2.7.1-fix_date_time_compiler.patch
Patch10: python-2.7-fix-parallel-make.patch
Patch11: python-2.7.1-linux3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define python_version %(echo %{version} | head -c 3)
@ -183,6 +184,7 @@ Authors:
%patch7 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.in