pool/python
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 2.7.4

Browse Source 
* bugfix-only release
- drop upstreamed patches:
    pypirc-secure.diff
    python-2.7.3-multiprocessing-join.patch
    ctypes-libffi-aarch64.patch
- drop python-2.7rc2-configure.patch as it doesn't seem necessary anymore

- removed %docdir/python/README from package (conflict with python-base)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=137
This commit is contained in:
Jan Matejek 2013-05-09 16:15:40 +00:00 committed by Git OBS Bridge
parent 3f16f9c855
commit fbe895940c
18 changed files with 151 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Python-2.7.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c
size 11793433

3
Python-2.7.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:035f705d40f8ec966f43206ba5008708e911cbfa99ab3b984af1222e24e9a359
size 12146770

3
python-2.7.3-docs-html.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6091c51e12aa7fd4d9f66f7b5fcb61fbe9319b510013eafe0831f889150b290c
size 4461799

3
python-2.7.3-docs-pdf-a4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec5c2c2fb40d27cdd1ccacb43121c855412b1d4cee37fecdc022ffc40ee57f89
size 10412309

3
python-2.7.3-docs-pdf-letter.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:966d731ad211e366375a10d7fa39060f2fc05d6b0e6a6930c3dc28f157fab349
size 10457184

34
python-2.7.3rc2-canonicalize2.patch → python-2.7.4-canonicalize2.patch
View File

@ -1,7 +1,7 @@
Index: Python/sysmodule.c Index: Python/sysmodule.c
=================================================================== ===================================================================
--- Python/sysmodule.c.orig 2012-03-28 20:13:00.000000000 +0200 --- Python/sysmodule.c.orig 2013-05-09 15:58:55.927351218 +0200
+++ Python/sysmodule.c 2012-03-28 20:13:00.000000000 +0200 +++ Python/sysmodule.c 2013-05-09 16:02:24.137048172 +0200
@@ -1620,7 +1620,20 @@ @@ -1620,7 +1620,20 @@
char *p = NULL; char *p = NULL;
Py_ssize_t n = 0; Py_ssize_t n = 0;
@ -56,23 +56,10 @@ Index: Python/sysmodule.c
if (PyList_Insert(path, 0, a) < 0) if (PyList_Insert(path, 0, a) < 0)
Py_FatalError("sys.path.insert(0) failed"); Py_FatalError("sys.path.insert(0) failed");
Py_DECREF(a); Py_DECREF(a);
Index: configure.in
===================================================================
--- configure.in.orig 2012-03-28 20:13:00.000000000 +0200
+++ configure.in 2012-03-28 20:13:00.000000000 +0200
@@ -2761,7 +2761,7 @@
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
Index: pyconfig.h.in Index: pyconfig.h.in
=================================================================== ===================================================================
--- pyconfig.h.in.orig 2012-03-16 02:26:39.000000000 +0100 --- pyconfig.h.in.orig 2013-05-09 15:58:55.941351601 +0200
+++ pyconfig.h.in 2012-03-28 20:13:00.000000000 +0200 +++ pyconfig.h.in 2013-05-09 16:02:24.138048200 +0200
@@ -106,6 +106,9 @@ @@ -106,6 +106,9 @@
/* Define to 1 if you have the 'chflags' function. */ /* Define to 1 if you have the 'chflags' function. */
#undef HAVE_CHFLAGS #undef HAVE_CHFLAGS
@ -83,3 +70,16 @@ Index: pyconfig.h.in
/* Define to 1 if you have the `chown' function. */ /* Define to 1 if you have the `chown' function. */
#undef HAVE_CHOWN #undef HAVE_CHOWN
Index: configure.ac
===================================================================
--- configure.ac.orig 2013-04-06 16:02:41.000000000 +0200
+++ configure.ac 2013-05-09 16:03:05.624184370 +0200
@@ -2878,7 +2878,7 @@
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \

3
python-2.7.4-docs-html.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0a6fe7588692b77fe2e0b58d9d39bc127171317d60ddc029bafd563a9577ec2
size 4456224

3
python-2.7.4-docs-pdf-a4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02610f52f2c9d92d89382bb291d246e959cb9514eff6a2395dbae682e0864854
size 10308397

3
python-2.7.4-docs-pdf-letter.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8fc2c4854b74dfe7bd25285c6e9cc3479ce20c38a82b770bd4aaa3790547c5cd
size 10366222

134
python-2.7.3rc2-multilib.patch → python-2.7.4-multilib.patch
View File

@ -1,53 +1,7 @@
Index: configure.in
===================================================================
--- configure.in.orig 2012-03-16 02:26:39.000000000 +0100
+++ configure.in 2012-03-28 20:09:13.000000000 +0200
@@ -630,6 +630,41 @@
;;
esac
+AC_SUBST(ARCH)
+AC_MSG_CHECKING(ARCH)
+ARCH=`uname -m`
+case $ARCH in
+i?86) ARCH=i386;;
+esac
+AC_MSG_RESULT($ARCH)
+
+AC_SUBST(LIB)
+AC_MSG_CHECKING(LIB)
+case $ac_sys_system in
+Linux*)
+ # Test if the compiler is 64bit
+ echo 'int i;' > conftest.$ac_ext
+ python_cv_cc_64bit_output=no
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *"ELF 64"*)
+ python_cv_cc_64bit_output=yes
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+case $ARCH:$python_cv_cc_64bit_output in
+aarch64:yes | ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+ LIB="lib64"
+ ;;
+*:*)
+ LIB="lib"
+ ;;
+esac
+AC_MSG_RESULT($LIB)
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
Index: Include/pythonrun.h Index: Include/pythonrun.h
=================================================================== ===================================================================
--- Include/pythonrun.h.orig 2012-03-16 02:26:31.000000000 +0100 --- Include/pythonrun.h.orig 2013-05-09 15:56:43.404729874 +0200
+++ Include/pythonrun.h 2012-03-28 20:09:13.000000000 +0200 +++ Include/pythonrun.h 2013-05-09 15:56:45.143777371 +0200
@@ -108,6 +108,8 @@ @@ -108,6 +108,8 @@
/* In their own files */ /* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetVersion(void);
@ -59,8 +13,8 @@ Index: Include/pythonrun.h
PyAPI_FUNC(const char *) Py_GetBuildInfo(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
Index: Lib/distutils/command/install.py Index: Lib/distutils/command/install.py
=================================================================== ===================================================================
--- Lib/distutils/command/install.py.orig 2012-03-28 20:09:11.000000000 +0200 --- Lib/distutils/command/install.py.orig 2013-05-09 15:56:43.405729901 +0200
+++ Lib/distutils/command/install.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/distutils/command/install.py 2013-05-09 15:56:45.144777398 +0200
@@ -22,6 +22,8 @@ @@ -22,6 +22,8 @@
from site import USER_SITE from site import USER_SITE
@ -81,9 +35,9 @@ Index: Lib/distutils/command/install.py
'data' : '$base', 'data' : '$base',
Index: Lib/distutils/sysconfig.py Index: Lib/distutils/sysconfig.py
=================================================================== ===================================================================
--- Lib/distutils/sysconfig.py.orig 2012-03-16 02:26:31.000000000 +0100 --- Lib/distutils/sysconfig.py.orig 2013-05-09 15:56:43.405729901 +0200
+++ Lib/distutils/sysconfig.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/distutils/sysconfig.py 2013-05-09 15:56:45.144777398 +0200
@@ -114,8 +114,11 @@ @@ -119,8 +119,11 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix": if os.name == "posix":
@ -99,8 +53,8 @@ Index: Lib/distutils/sysconfig.py
else: else:
Index: Lib/pydoc.py Index: Lib/pydoc.py
=================================================================== ===================================================================
--- Lib/pydoc.py.orig 2012-03-16 02:26:33.000000000 +0100 --- Lib/pydoc.py.orig 2013-05-09 15:56:43.406729928 +0200
+++ Lib/pydoc.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/pydoc.py 2013-05-09 15:56:45.145777426 +0200
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
docloc = os.environ.get("PYTHONDOCS", docloc = os.environ.get("PYTHONDOCS",
@ -112,8 +66,8 @@ Index: Lib/pydoc.py
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp', (object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
Index: Lib/site.py Index: Lib/site.py
=================================================================== ===================================================================
--- Lib/site.py.orig 2012-03-16 02:26:33.000000000 +0100 --- Lib/site.py.orig 2013-05-09 15:56:43.407729956 +0200
+++ Lib/site.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/site.py 2013-05-09 15:56:45.146777453 +0200
@@ -300,13 +300,18 @@ @@ -300,13 +300,18 @@
if sys.platform in ('os2emx', 'riscos'): if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@ -138,8 +92,8 @@ Index: Lib/site.py
# locations. # locations.
Index: Lib/sysconfig.py Index: Lib/sysconfig.py
=================================================================== ===================================================================
--- Lib/sysconfig.py.orig 2012-03-16 02:26:33.000000000 +0100 --- Lib/sysconfig.py.orig 2013-05-09 15:56:43.408729983 +0200
+++ Lib/sysconfig.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/sysconfig.py 2013-05-09 15:56:45.146777453 +0200
@@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
_INSTALL_SCHEMES = { _INSTALL_SCHEMES = {
@ -170,8 +124,8 @@ Index: Lib/sysconfig.py
'data' : '{userbase}', 'data' : '{userbase}',
Index: Lib/test/test_dl.py Index: Lib/test/test_dl.py
=================================================================== ===================================================================
--- Lib/test/test_dl.py.orig 2012-03-16 02:26:34.000000000 +0100 --- Lib/test/test_dl.py.orig 2013-05-09 15:56:43.408729983 +0200
+++ Lib/test/test_dl.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/test/test_dl.py 2013-05-09 15:56:45.146777453 +0200
@@ -5,10 +5,11 @@ @@ -5,10 +5,11 @@
import unittest import unittest
from test.test_support import verbose, import_module from test.test_support import verbose, import_module
@ -188,8 +142,8 @@ Index: Lib/test/test_dl.py
] ]
Index: Lib/test/test_site.py Index: Lib/test/test_site.py
=================================================================== ===================================================================
--- Lib/test/test_site.py.orig 2012-03-16 02:26:34.000000000 +0100 --- Lib/test/test_site.py.orig 2013-05-09 15:56:43.409730010 +0200
+++ Lib/test/test_site.py 2012-03-28 20:11:10.000000000 +0200 +++ Lib/test/test_site.py 2013-05-09 15:56:45.146777453 +0200
@@ -241,12 +241,16 @@ @@ -241,12 +241,16 @@
self.assertEqual(dirs[2], wanted) self.assertEqual(dirs[2], wanted)
elif os.sep == '/': elif os.sep == '/':
@ -212,8 +166,8 @@ Index: Lib/test/test_site.py
self.assertEqual(len(dirs), 2) self.assertEqual(len(dirs), 2)
Index: Lib/trace.py Index: Lib/trace.py
=================================================================== ===================================================================
--- Lib/trace.py.orig 2012-03-16 02:26:34.000000000 +0100 --- Lib/trace.py.orig 2013-05-09 15:56:43.409730010 +0200
+++ Lib/trace.py 2012-03-28 20:09:13.000000000 +0200 +++ Lib/trace.py 2013-05-09 15:56:45.147777480 +0200
@@ -754,10 +754,10 @@ @@ -754,10 +754,10 @@
# should I also call expanduser? (after all, could use $HOME) # should I also call expanduser? (after all, could use $HOME)
@ -229,18 +183,18 @@ Index: Lib/trace.py
ignore_dirs.append(s) ignore_dirs.append(s)
Index: Makefile.pre.in Index: Makefile.pre.in
=================================================================== ===================================================================
--- Makefile.pre.in.orig 2012-03-28 20:09:11.000000000 +0200 --- Makefile.pre.in.orig 2013-05-09 15:56:43.410730038 +0200
+++ Makefile.pre.in 2012-03-28 20:09:13.000000000 +0200 +++ Makefile.pre.in 2013-05-09 15:56:45.147777480 +0200
@@ -81,6 +81,8 @@ @@ -87,6 +87,8 @@
# Machine-dependent subdirectories # Machine-dependent subdirectories
MACHDEP= @MACHDEP@ MACHDEP= @MACHDEP@
+LIB= @LIB@ +LIB= @LIB@
+ARCH= @ARCH@ +ARCH= @ARCH@
# Install prefix for architecture-independent files # Multiarch directory (may be empty)
prefix= @prefix@ MULTIARCH= @MULTIARCH@
@@ -533,6 +535,7 @@ @@ -574,6 +576,7 @@
-DEXEC_PREFIX='"$(exec_prefix)"' \ -DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \ -DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \ -DVPATH='"$(VPATH)"' \
@ -248,7 +202,7 @@ Index: Makefile.pre.in
-o $@ $(srcdir)/Modules/getpath.c -o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c Modules/python.o: $(srcdir)/Modules/python.c
@@ -567,7 +570,7 @@ @@ -616,7 +619,7 @@
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
Python/getplatform.o: $(srcdir)/Python/getplatform.c Python/getplatform.o: $(srcdir)/Python/getplatform.c
@ -259,8 +213,8 @@ Index: Makefile.pre.in
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
Index: Modules/getpath.c Index: Modules/getpath.c
=================================================================== ===================================================================
--- Modules/getpath.c.orig 2012-03-16 02:26:37.000000000 +0100 --- Modules/getpath.c.orig 2013-05-09 15:56:43.411730065 +0200
+++ Modules/getpath.c 2012-03-28 20:09:13.000000000 +0200 +++ Modules/getpath.c 2013-05-09 15:56:45.148777508 +0200
@@ -116,9 +116,11 @@ @@ -116,9 +116,11 @@
#define EXEC_PREFIX PREFIX #define EXEC_PREFIX PREFIX
#endif #endif
@ -286,8 +240,8 @@ Index: Modules/getpath.c
reduce(char *dir) reduce(char *dir)
Index: Python/getplatform.c Index: Python/getplatform.c
=================================================================== ===================================================================
--- Python/getplatform.c.orig 2012-03-16 02:26:38.000000000 +0100 --- Python/getplatform.c.orig 2013-05-09 15:56:43.411730065 +0200
+++ Python/getplatform.c 2012-03-28 20:09:13.000000000 +0200 +++ Python/getplatform.c 2013-05-09 15:56:45.148777508 +0200
@@ -10,3 +10,23 @@ @@ -10,3 +10,23 @@
{ {
return PLATFORM; return PLATFORM;
@ -314,8 +268,8 @@ Index: Python/getplatform.c
+} +}
Index: Python/sysmodule.c Index: Python/sysmodule.c
=================================================================== ===================================================================
--- Python/sysmodule.c.orig 2012-03-16 02:26:39.000000000 +0100 --- Python/sysmodule.c.orig 2013-05-09 15:56:43.412730092 +0200
+++ Python/sysmodule.c 2012-03-28 20:09:13.000000000 +0200 +++ Python/sysmodule.c 2013-05-09 15:56:45.149777535 +0200
@@ -1419,6 +1419,10 @@ @@ -1419,6 +1419,10 @@
PyString_FromString(Py_GetCopyright())); PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform", SET_SYS_FROM_STRING("platform",
@ -329,9 +283,9 @@ Index: Python/sysmodule.c
SET_SYS_FROM_STRING("prefix", SET_SYS_FROM_STRING("prefix",
Index: setup.py Index: setup.py
=================================================================== ===================================================================
--- setup.py.orig 2012-03-16 02:26:39.000000000 +0100 --- setup.py.orig 2013-05-09 15:56:43.414730147 +0200
+++ setup.py 2012-03-28 20:09:13.000000000 +0200 +++ setup.py 2013-05-09 15:56:45.150777562 +0200
@@ -369,7 +369,7 @@ @@ -437,7 +437,7 @@
def detect_modules(self): def detect_modules(self):
# Ensure that /usr/local is always used # Ensure that /usr/local is always used
@ -340,17 +294,7 @@ Index: setup.py
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
self.add_multiarch_paths() self.add_multiarch_paths()
@@ -427,8 +427,7 @@ @@ -755,11 +755,11 @@
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + [
- '/lib64', '/usr/lib64',
- '/lib', '/usr/lib',
+ '/' + sys.lib, '/usr/' + sys.lib,
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
@@ -677,11 +676,11 @@
elif curses_library: elif curses_library:
readline_libs.append(curses_library) readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs + elif self.compiler.find_library_file(lib_dirs +
@ -364,9 +308,9 @@ Index: setup.py
extra_link_args=readline_extra_link_args, extra_link_args=readline_extra_link_args,
libraries=readline_libs) ) libraries=readline_libs) )
else: else:
@@ -1753,18 +1752,17 @@ @@ -1860,18 +1860,17 @@
# Check for various platform-specific directories # Check for various platform-specific directories
if platform == 'sunos5': if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include') include_dirs.append('/usr/openwin/include')
- added_lib_dirs.append('/usr/openwin/lib') - added_lib_dirs.append('/usr/openwin/lib')
+ added_lib_dirs.append('/usr/openwin/' + sys.lib) + added_lib_dirs.append('/usr/openwin/' + sys.lib)
@ -386,4 +330,4 @@ Index: setup.py
+ added_lib_dirs.append('/usr/X11/' + sys.lib) + added_lib_dirs.append('/usr/X11/' + sys.lib)
# If Cygwin, then verify that X is installed before proceeding # If Cygwin, then verify that X is installed before proceeding
if platform == 'cygwin': if host_platform == 'cygwin':

19
python-2.7.4-no-REUSEPORT.patch Normal file
View File

@ -0,0 +1,19 @@
Index: Python-2.7.4/Lib/test/test_support.py
===================================================================
--- Python-2.7.4.orig/Lib/test/test_support.py 2013-04-06 16:02:32.000000000 +0200
+++ Python-2.7.4/Lib/test/test_support.py 2013-05-09 17:46:46.789663295 +0200
@@ -371,10 +371,10 @@
if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1:
raise TestFailed("tests should never set the SO_REUSEADDR " \
"socket option on TCP/IP sockets!")
- if hasattr(socket, 'SO_REUSEPORT'):
- if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
- raise TestFailed("tests should never set the SO_REUSEPORT " \
- "socket option on TCP/IP sockets!")
+# if hasattr(socket, 'SO_REUSEPORT'):
+# if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
+# raise TestFailed("tests should never set the SO_REUSEPORT " \
+# "socket option on TCP/IP sockets!")
if hasattr(socket, 'SO_EXCLUSIVEADDRUSE'):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)

11
python-base.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu May 9 16:11:23 UTC 2013 - jmatejek@suse.com
- update to 2.7.4
* bugfix-only release
- drop upstreamed patches:
pypirc-secure.diff
python-2.7.3-multiprocessing-join.patch
ctypes-libffi-aarch64.patch
- drop python-2.7rc2-configure.patch as it doesn't seem necessary anymore
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 13:33:27 UTC 2013 - idonmez@suse.com Fri Apr 5 13:33:27 UTC 2013 - idonmez@suse.com

23
python-base.spec
View File

@ -18,7 +18,7 @@
Name: python-base Name: python-base
Version: 2.7.3 Version: 2.7.4
Release: 0 Release: 0
License: Python-2.0 License: Python-2.0
Summary: Python Interpreter base package Summary: Python Interpreter base package
@ -34,9 +34,9 @@ Source5: _local.pth
# COMMON-PATCH-BEGIN # COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.3rc2-multilib.patch Patch3: python-2.7.4-multilib.patch
Patch4: python-2.5.1-sqlite.patch Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.3rc2-canonicalize2.patch Patch5: python-2.7.4-canonicalize2.patch
Patch6: python-2.7rc2-configure.patch Patch6: python-2.7rc2-configure.patch
Patch7: python-2.6-gettext-plurals.patch Patch7: python-2.6-gettext-plurals.patch
Patch8: python-2.6b3-curses-panel.patch Patch8: python-2.6b3-curses-panel.patch
@ -45,16 +45,15 @@ Patch10: sparc_longdouble.patch
Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch
Patch13: python-2.7.2-fix_date_time_compiler.patch Patch13: python-2.7.2-fix_date_time_compiler.patch
Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch15: python-2.7.2-disable-tests-in-test_io.patch
Patch16: pypirc-secure.diff
Patch17: remove-static-libpython.diff Patch17: remove-static-libpython.diff
# PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions
Patch18: python-2.7.3-ssl_ca_path.patch Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle.
Patch20: python-bundle-lang.patch Patch20: python-bundle-lang.patch
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module # PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.patch Patch22: ctypes-libffi-aarch64.patch
Patch23: python-2.7.4-no-REUSEPORT.patch
# COMMON-PATCH-END # COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3) %define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake BuildRequires: automake
@ -117,7 +116,7 @@ often compared to Tcl, Perl, Scheme, or Java. You can find an overview
of Python in the documentation and tutorials included in the python-doc of Python in the documentation and tutorials included in the python-doc
(HTML) or python-doc-pdf (PDF) packages. (HTML) or python-doc-pdf (PDF) packages.
This package contains libpython2.6 shared library for embedding in This package contains libpython2.7 shared library for embedding in
other applications. other applications.
%prep %prep
@ -129,7 +128,7 @@ other applications.
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 #%patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1 %patch9 -p1
@ -140,17 +139,16 @@ other applications.
%ifarch ppc ppc64 %ifarch ppc ppc64
%patch15 -p1 %patch15 -p1
%endif %endif
%patch16 -p1
%patch17 %patch17
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 #%patch22 -p1
%patch22 -p1 %patch23 -p1
# COMMON-PREP-END
# drop Autoconf version requirement # drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.in sed -i 's/^version_required/dnl version_required/' configure.ac
# COMMON-PREP-END
%build %build
export OPT="%{optflags}" export OPT="%{optflags}"
@ -290,6 +288,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v
%doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/LICENSE
%doc %{_docdir}/%{name}/README.SUSE %doc %{_docdir}/%{name}/README.SUSE
%doc %{_mandir}/man1/python.1* %doc %{_mandir}/man1/python.1*
%doc %{_mandir}/man1/python2.1*
%doc %{_mandir}/man1/python%{python_version}.1* %doc %{_mandir}/man1/python%{python_version}.1*
%dir %{_includedir}/python%{python_version} %dir %{_includedir}/python%{python_version}
%{_includedir}/python%{python_version}/pyconfig.h %{_includedir}/python%{python_version}/pyconfig.h

6
python-doc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 9 16:14:17 UTC 2013 - jmatejek@suse.com
- update to 2.7.4
- removed %docdir/python/README from package (conflict with python-base)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 13:33:29 UTC 2013 - idonmez@suse.com Fri Apr 5 13:33:29 UTC 2013 - idonmez@suse.com

22
python-doc.spec
View File

@ -22,7 +22,7 @@ License: Python-2.0
Summary: Additional Package Documentation for Python Summary: Additional Package Documentation for Python
Url: http://www.python.org/ Url: http://www.python.org/
Group: Development/Languages/Python Group: Development/Languages/Python
%define pyver 2.7.3 %define pyver 2.7.4
%define tarname Python-%{pyver} %define tarname Python-%{pyver}
Source0: %{tarname}.tar.bz2 Source0: %{tarname}.tar.bz2
Source1: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2 Source1: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2
@ -31,9 +31,9 @@ Source3: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-
# COMMON-PATCH-BEGIN # COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.3rc2-multilib.patch Patch3: python-2.7.4-multilib.patch
Patch4: python-2.5.1-sqlite.patch Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.3rc2-canonicalize2.patch Patch5: python-2.7.4-canonicalize2.patch
Patch6: python-2.7rc2-configure.patch Patch6: python-2.7rc2-configure.patch
Patch7: python-2.6-gettext-plurals.patch Patch7: python-2.6-gettext-plurals.patch
Patch8: python-2.6b3-curses-panel.patch Patch8: python-2.6b3-curses-panel.patch
@ -85,7 +85,7 @@ Python, and Macintosh Module Reference in PDF format.
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 #%patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1 %patch9 -p1
@ -96,13 +96,16 @@ Python, and Macintosh Module Reference in PDF format.
%ifarch ppc ppc64 %ifarch ppc ppc64
%patch15 -p1 %patch15 -p1
%endif %endif
%patch16 -p1 #%patch16 -p1
%patch17 %patch17
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 #%patch21 -p1
%patch22 -p1 #%patch22 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
# COMMON-PREP-END # COMMON-PREP-END
%build %build
@ -118,7 +121,8 @@ mv $PDOCS/docs-pdf $PDOCS/paper-a4
tar xfj %{SOURCE3} -C $PDOCS tar xfj %{SOURCE3} -C $PDOCS
mv $PDOCS/docs-pdf $PDOCS/paper-letter mv $PDOCS/docs-pdf $PDOCS/paper-letter
install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt
install -c -m 644 README $PDOCS/README # this is part of main package
#install -c -m 644 README $PDOCS/README
for i in Misc/* ; do for i in Misc/* ; do
[ -f $i ] && install -c -m 644 $i $PDOCS/Misc/ [ -f $i ] && install -c -m 644 $i $PDOCS/Misc/
done done
@ -129,7 +133,7 @@ done
%doc %{_docdir}/python/Misc %doc %{_docdir}/python/Misc
%doc %{_docdir}/python/html %doc %{_docdir}/python/html
%doc %{_docdir}/python/ACKS.txt %doc %{_docdir}/python/ACKS.txt
%doc %{_docdir}/python/README #%doc %{_docdir}/python/README
%files pdf %files pdf
%defattr(644,root,root,755) %defattr(644,root,root,755)

5
python.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 9 16:14:07 UTC 2013 - jmatejek@suse.com
- update to 2.7.4
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 13:33:33 UTC 2013 - idonmez@suse.com Fri Apr 5 13:33:33 UTC 2013 - idonmez@suse.com

18
python.spec
View File

@ -16,7 +16,7 @@
# #
Name: python Name: python
Version: 2.7.3 Version: 2.7.4
Release: 0 Release: 0
License: Python-2.0 License: Python-2.0
Summary: Python Interpreter Summary: Python Interpreter
@ -39,9 +39,9 @@ Source4: python.csh
# COMMON-PATCH-BEGIN # COMMON-PATCH-BEGIN
Patch1: python-2.7-dirs.patch Patch1: python-2.7-dirs.patch
Patch2: python-distutils-rpm-8.patch Patch2: python-distutils-rpm-8.patch
Patch3: python-2.7.3rc2-multilib.patch Patch3: python-2.7.4-multilib.patch
Patch4: python-2.5.1-sqlite.patch Patch4: python-2.5.1-sqlite.patch
Patch5: python-2.7.3rc2-canonicalize2.patch Patch5: python-2.7.4-canonicalize2.patch
Patch6: python-2.7rc2-configure.patch Patch6: python-2.7rc2-configure.patch
Patch7: python-2.6-gettext-plurals.patch Patch7: python-2.6-gettext-plurals.patch
Patch8: python-2.6b3-curses-panel.patch Patch8: python-2.6b3-curses-panel.patch
@ -168,7 +168,7 @@ implementation of the standard Unix DBM databases.
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 #%patch6
%patch7 %patch7
%patch8 %patch8
%patch9 -p1 %patch9 -p1
@ -179,17 +179,17 @@ implementation of the standard Unix DBM databases.
%ifarch ppc ppc64 %ifarch ppc ppc64
%patch15 -p1 %patch15 -p1
%endif %endif
%patch16 -p1 #%patch16 -p1
%patch17 %patch17
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 #%patch21 -p1
%patch22 -p1 #%patch22 -p1
# COMMON-PREP-END
# drop Autoconf version requirement # drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.in sed -i 's/^version_required/dnl version_required/' configure.ac
# COMMON-PREP-END
# remove newslist.py because of bad license # remove newslist.py because of bad license
rm Demo/scripts/newslist.* rm Demo/scripts/newslist.*

16
remove-static-libpython.diff
View File

@ -1,6 +1,8 @@
--- Makefile.pre.in Index: Makefile.pre.in
+++ Makefile.pre.in ===================================================================
@@ -396,7 +396,7 @@ --- Makefile.pre.in.orig 2013-05-09 16:43:42.529229385 +0200
+++ Makefile.pre.in 2013-05-09 16:43:42.562230253 +0200
@@ -434,7 +434,7 @@
# Build the interpreter # Build the interpreter
@ -9,9 +11,9 @@
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \ Modules/python.o \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
@@ -412,18 +412,6 @@ @@ -455,18 +455,6 @@
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
esac $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-# Build static library -# Build static library
-# avoid long command lines, same as LIBRARY_OBJS -# avoid long command lines, same as LIBRARY_OBJS
@ -28,7 +30,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS) libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \ if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
@@ -1008,18 +996,6 @@ @@ -1084,18 +1072,6 @@
else true; \ else true; \
fi; \ fi; \
done done