rpm/python
SHA256
1
0
Fork 0
forked from pool/python
Code Pull Requests Activity

Accepting request 30832 from devel:languages:python:Factory

Browse Source 
Copy from devel:languages:python:Factory/python based on submit request 30832 from user matejcik

OBS-URL: https://build.opensuse.org/request/show/30832
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=42
This commit is contained in:
OBS User autobuild 2010-01-29 17:51:47 +00:00 committed by Git OBS Bridge
parent 8d16680d12
commit b557378c0d
14 changed files with 96 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python-2.5.2-configure.patch
View File

@ -1,6 +1,8 @@
--- configure.in
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -509,9 +509,6 @@
@@ -511,9 +511,6 @@ then
fi
@ -10,7 +12,7 @@
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
atheos*|Linux*/1*)
@@ -572,6 +569,9 @@
@@ -574,6 +571,9 @@ SunOS*)
;;
esac
@ -20,7 +22,7 @@
AC_SUBST(ARCH)
AC_MSG_CHECKING(ARCH)
ARCH=`uname -m`
@@ -3406,9 +3406,18 @@
@@ -3413,9 +3413,18 @@ then
fi
# check for readline 4.0

6
python-2.5.2-fwrapv.patch
View File

@ -1,6 +1,8 @@
--- Makefile.pre.in
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in.orig
+++ Makefile.pre.in
@@ -57,7 +57,7 @@
@@ -57,7 +57,7 @@ MAKESETUP= $(srcdir)/Modules/makese
# Compiler options
OPT= @OPT@
BASECFLAGS= @BASECFLAGS@

6
python-2.6-gettext-plurals.patch
View File

@ -1,6 +1,8 @@
--- Lib/gettext.py
Index: Lib/gettext.py
===================================================================
--- Lib/gettext.py.orig
+++ Lib/gettext.py
@@ -311,8 +311,9 @@
@@ -311,8 +311,9 @@ class GNUTranslations(NullTranslations):
self._charset = v.split('charset=')[1]
elif k == 'plural-forms':
v = v.split(';')

19
python-2.6.2-expat.patch
View File

@ -1,8 +1,8 @@
Index: Lib/test/test_pyexpat.py
===================================================================
--- Lib/test/test_pyexpat.py (revision 74428)
+++ Lib/test/test_pyexpat.py (revision 74429)
@@ -559,7 +559,25 @@
--- Lib/test/test_pyexpat.py.orig
+++ Lib/test/test_pyexpat.py
@@ -559,6 +559,24 @@ class ChardataBufferTest(unittest.TestCa
parser.Parse(xml2, 1)
self.assertEquals(self.n, 4)
@ -15,7 +15,7 @@ Index: Lib/test/test_pyexpat.py
+ self.fail()
+ except expat.ExpatError as e:
+ self.assertEquals(str(e), 'no element found: line 2, column 1')
+
+ def test2(self):
+ xml = "<?xml version\xc2\x85='1.0'?>\r\n"
+ parser = expat.ParserCreate()
@ -24,11 +24,10 @@ Index: Lib/test/test_pyexpat.py
+ self.fail()
+ except expat.ExpatError as e:
+ self.assertEquals(str(e), 'XML declaration not well-formed: line 1, column 14')
+
def test_main():
run_unittest(SetAttributeTest,
ParseTest,
@@ -569,7 +587,8 @@
@@ -569,7 +587,8 @@ def test_main():
HandlerExceptionTest,
PositionTest,
sf1296433Test,
@ -40,9 +39,9 @@ Index: Lib/test/test_pyexpat.py
test_main()
Index: Modules/expat/xmltok_impl.c
===================================================================
--- Modules/expat/xmltok_impl.c (revision 74428)
+++ Modules/expat/xmltok_impl.c (revision 74429)
@@ -1741,7 +1741,7 @@
--- Modules/expat/xmltok_impl.c.orig
+++ Modules/expat/xmltok_impl.c
@@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e
const char *end,
POSITION *pos)
{

6
python-2.6.2-test_distutils.patch
View File

@ -1,6 +1,8 @@
--- Lib/distutils/tests/test_bdist_wininst.py
Index: Lib/distutils/tests/test_bdist_wininst.py
===================================================================
--- Lib/distutils/tests/test_bdist_wininst.py.orig
+++ Lib/distutils/tests/test_bdist_wininst.py
@@ -5,11 +5,13 @@
@@ -5,11 +5,13 @@ import os
from distutils.dist import Distribution
from distutils.command.bdist_wininst import bdist_wininst
from distutils.tests import support

22
python-2.6b1-canonicalize2.patch
View File

@ -1,6 +1,8 @@
--- Python/sysmodule.c
Index: Python/sysmodule.c
===================================================================
--- Python/sysmodule.c.orig
+++ Python/sysmodule.c
@@ -1532,7 +1532,20 @@
@@ -1550,7 +1550,20 @@ PySys_SetArgv(int argc, char **argv)
char *p = NULL;
Py_ssize_t n = 0;
PyObject *a;
@ -22,7 +24,7 @@
char link[MAXPATHLEN+1];
char argv0copy[2*MAXPATHLEN+1];
int nr = 0;
@@ -1559,7 +1572,8 @@
@@ -1577,7 +1590,8 @@ PySys_SetArgv(int argc, char **argv)
}
}
}
@ -32,7 +34,7 @@
#if SEP == '\\' /* Special case for MS filename syntax */
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
char *q;
@@ -1585,11 +1599,6 @@
@@ -1606,11 +1620,6 @@ PySys_SetArgv(int argc, char **argv)
}
#else /* All other filename syntaxes */
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
@ -44,7 +46,7 @@
p = strrchr(argv0, SEP);
}
if (p != NULL) {
@@ -1607,6 +1616,9 @@
@@ -1628,6 +1637,9 @@ PySys_SetArgv(int argc, char **argv)
a = PyString_FromStringAndSize(argv0, n);
if (a == NULL)
Py_FatalError("no mem for sys.path insertion");
@ -54,9 +56,11 @@
if (PyList_Insert(path, 0, a) < 0)
Py_FatalError("sys.path.insert(0) failed");
Py_DECREF(a);
--- configure.in
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -2473,7 +2473,7 @@
@@ -2495,7 +2495,7 @@ AC_CHECK_FUNCS(alarm setitimer getitimer
getpriority getpwent getspnam getspent getsid getwd \
kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
@ -65,7 +69,9 @@
select setegid seteuid setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
sigaction siginterrupt sigrelse strftime \
--- pyconfig.h.in
Index: pyconfig.h.in
===================================================================
--- pyconfig.h.in.orig
+++ pyconfig.h.in
@@ -79,6 +79,9 @@
/* Define to 1 if you have the `chflags' function. */

31
python-2.6rc2-https-proxy.patch
View File

@ -1,8 +1,8 @@
Index: Lib/httplib.py
===================================================================
--- Lib/httplib.py (revision 66111)
+++ Lib/httplib.py (working copy)
@@ -651,11 +651,17 @@
--- Lib/httplib.py.orig
+++ Lib/httplib.py
@@ -652,11 +652,17 @@ class HTTPConnection:
self.__response = None
self.__state = _CS_IDLE
self._method = None
@ -20,7 +20,7 @@ Index: Lib/httplib.py
def _set_hostport(self, host, port):
if port is None:
i = host.rfind(':')
@@ -676,10 +682,24 @@
@@ -677,10 +683,24 @@ class HTTPConnection:
def set_debuglevel(self, level):
self.debuglevel = level
@ -45,7 +45,7 @@ Index: Lib/httplib.py
def close(self):
"""Close the connection to the HTTP server."""
@@ -1069,6 +1089,9 @@
@@ -1070,6 +1090,9 @@ else:
"Connect to a host on a given (SSL) port."
sock = socket.create_connection((self.host, self.port), self.timeout)
@ -57,9 +57,9 @@ Index: Lib/httplib.py
__all__.append("HTTPSConnection")
Index: Lib/urllib2.py
===================================================================
--- Lib/urllib2.py (revision 66111)
+++ Lib/urllib2.py (working copy)
@@ -192,6 +192,7 @@
--- Lib/urllib2.py.orig
+++ Lib/urllib2.py
@@ -192,6 +192,7 @@ class Request:
# self.__r_type is what's left after doing the splittype
self.host = None
self.port = None
@ -67,7 +67,7 @@ Index: Lib/urllib2.py
self.data = data
self.headers = {}
for key, value in headers.items():
@@ -252,9 +253,14 @@
@@ -252,8 +253,13 @@ class Request:
return self.__r_host
def set_proxy(self, host, type):
@ -79,12 +79,11 @@ Index: Lib/urllib2.py
+ self.type = type
+ self.__r_host = self.__original
+ self.host = host
+
def has_proxy(self):
return self.__r_host == self.__original
@@ -700,7 +706,7 @@
@@ -700,7 +706,7 @@ class ProxyHandler(BaseHandler):
req.add_header('Proxy-authorization', 'Basic ' + creds)
hostport = unquote(hostport)
req.set_proxy(hostport, proxy_type)
@ -93,7 +92,7 @@ Index: Lib/urllib2.py
# let other handlers take care of it
return None
else:
@@ -1098,6 +1104,9 @@
@@ -1098,6 +1104,9 @@ class AbstractHTTPHandler(BaseHandler):
headers["Connection"] = "close"
headers = dict(
(name.title(), val) for name, val in headers.items())
@ -105,9 +104,9 @@ Index: Lib/urllib2.py
r = h.getresponse()
Index: Lib/test/test_urllib2.py
===================================================================
--- Lib/test/test_urllib2.py (revision 66111)
+++ Lib/test/test_urllib2.py (working copy)
@@ -939,6 +939,23 @@
--- Lib/test/test_urllib2.py.orig
+++ Lib/test/test_urllib2.py
@@ -939,6 +939,23 @@ class HandlerTests(unittest.TestCase):
self.assertEqual([(handlers[0], "http_open")],
[tup[0:2] for tup in o.calls])

10
python-base.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jan 29 15:44:15 CET 2010 - matejcik@suse.cz
- enabled ipv6 in configure (bnc#572673)
-------------------------------------------------------------------
Wed Dec 23 08:36:29 UTC 2009 - aj@suse.de
- Apply patches with fuzz=0
-------------------------------------------------------------------
Tue Dec 15 00:22:44 CET 2009 - jengelh@medozas.de

5
python-base.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-base (Version 2.6.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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
@ -33,7 +33,7 @@ Obsoletes: python-64bit
#
Summary: Python Interpreter base package
Version: 2.6.2
Release: 7
Release: 8
%define tarname Python-%{version}
Source0: %{tarname}.tar.bz2
Source1: macros.python
@ -168,6 +168,7 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
--mandir=%{_mandir} \
--docdir=%{_docdir}/python \
--with-fpectl \
--enable-ipv6 \
--enable-shared \
--enable-unicode=ucs4
########################################

14
python-distutils-rpm-8.patch
View File

@ -1,6 +1,8 @@
--- Python-2.4c1.orig/Lib/distutils/command/install.py 2004-11-23 12:03:25.394124018 +0100
+++ Python-2.4c1/Lib/distutils/command/install.py 2004-11-23 12:29:28.270687563 +0100
@@ -135,6 +135,8 @@
Index: Python-2.6.2/Lib/distutils/command/install.py
===================================================================
--- Python-2.6.2.orig/Lib/distutils/command/install.py
+++ Python-2.6.2/Lib/distutils/command/install.py
@@ -168,6 +168,8 @@ class install (Command):
('record=', None,
"filename in which to record list of installed files"),
@ -8,8 +10,8 @@
+ "filename in which to record list of installed files and directories suitable as filelist for rpm"),
]
boolean_options = ['compile', 'force', 'skip-build']
@@ -207,6 +209,7 @@
boolean_options = ['compile', 'force', 'skip-build', 'user']
@@ -243,6 +245,7 @@ class install (Command):
#self.install_info = None
self.record = None
@ -17,7 +19,7 @@
# -- Option finalizing methods -------------------------------------
@@ -508,12 +511,61 @@
@@ -592,12 +595,61 @@ class install (Command):
self.create_path_file()
# write list of installed files, if requested.

5
python-doc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 23 08:36:27 UTC 2009 - aj@suse.de
- Apply patches with fuzz=0
-------------------------------------------------------------------
Mon Apr 27 15:21:03 CEST 2009 - matejcik@suse.cz

4
python-doc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-doc (Version 2.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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.6
Release: 17
Release: 18
%define pyver 2.6.2
BuildArch: noarch
%define tarname Python-%{pyver}

10
python.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jan 29 15:44:28 CET 2010 - matejcik@suse.cz
- enabled ipv6 in configure (bnc#572673)
-------------------------------------------------------------------
Wed Dec 23 08:36:32 UTC 2009 - aj@suse.de
- Apply patches with fuzz=0
-------------------------------------------------------------------
Wed Dec 2 18:40:21 UTC 2009 - coolo@novell.com

4
python.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python (Version 2.6.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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
@ -35,7 +35,7 @@ Obsoletes: python-64bit
Obsoletes: python-nothreads python21 python-elementtree python-sqlite
Summary: Python Interpreter
Version: 2.6.2
Release: 7
Release: 8
Requires: python-base = %{version}
%define tarname Python-%{version}
Source0: %{tarname}.tar.bz2