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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2007-05-24 22:42:28 +00:00 committed by Git OBS Bridge
parent e1bd555505
commit bc99b94232
17 changed files with 72 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Python-2.4-readline.patch
View File

@ -1,37 +0,0 @@
--- configure.in.orig 2004-11-07 02:24:11.000000000 +0100
+++ configure.in 2004-12-06 12:10:32.624789124 +0100
@@ -2822,10 +2822,18 @@
[Define this if you have flockfile(), getc_unlocked(), and funlockfile()])
fi
+# what library does readline need to be linked with
+READLINE_SHARED_LIBADD=""
+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
+ AC_CHECK_LIB(curses, tgetent, [READLINE_SHARED_LIBADD="-lcurses"],
+ AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"])
+ )
+ )
+
# check for readline 2.1
AC_CHECK_LIB(readline, rl_callback_handler_install,
AC_DEFINE(HAVE_RL_CALLBACK, 1,
- [Define if you have readline 2.1]), , -ltermcap)
+ [Define if you have readline 2.1]), , $READLINE_SHARED_LIBADD)
# check for readline 2.2
AC_TRY_CPP([#include <readline/readline.h>],
@@ -2841,12 +2849,12 @@
# check for readline 4.0
AC_CHECK_LIB(readline, rl_pre_input_hook,
AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
- [Define if you have readline 4.0]), , -ltermcap)
+ [Define if you have readline 4.0]), , $READLINE_SHARED_LIBADD)
# check for readline 4.2
AC_CHECK_LIB(readline, rl_completion_matches,
AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
- [Define if you have readline 4.2]), , -ltermcap)
+ [Define if you have readline 4.2]), , $READLINE_SHARED_LIBADD)
# also in readline 4.2
AC_TRY_CPP([#include <readline/readline.h>],

78
Python-2.5-db45.patch
View File

@ -1,78 +0,0 @@
--- Modules/_bsddb.c
+++ Modules/_bsddb.c
@@ -4129,6 +4129,8 @@
}
+#if (DBVER < 45)
+
static PyObject*
DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
{
@@ -4145,6 +4147,7 @@
RETURN_NONE();
}
+#endif
#if (DBVER >= 32)
@@ -5233,7 +5236,9 @@
{"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
#endif
{"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
+#if (DBVER < 45)
{"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
+#endif
#if (DBVER >= 32)
{"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
{"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
@@ -5835,7 +5840,9 @@
ADD_INT(d, DB_AFTER);
ADD_INT(d, DB_APPEND);
ADD_INT(d, DB_BEFORE);
+#if (DBVER < 45)
ADD_INT(d, DB_CACHED_COUNTS);
+#endif
#if (DBVER >= 41)
_addIntToDict(d, "DB_CHECKPOINT", 0);
#else
@@ -5870,7 +5877,9 @@
ADD_INT(d, DB_POSITION);
ADD_INT(d, DB_PREV);
ADD_INT(d, DB_PREV_NODUP);
+#if (DBVER < 45)
ADD_INT(d, DB_RECORDCOUNT);
+#endif
ADD_INT(d, DB_SET);
ADD_INT(d, DB_SET_RANGE);
ADD_INT(d, DB_SET_RECNO);
--- setup.py
+++ setup.py
@@ -609,7 +609,7 @@
# a release. Most open source OSes come with one or more
# versions of BerkeleyDB already installed.
- max_db_ver = (4, 4)
+ max_db_ver = (4, 5)
min_db_ver = (3, 3)
db_setup_debug = False # verbose debug prints from this script?
@@ -626,7 +626,7 @@
'/sw/include/db3',
]
# 4.x minor number specific paths
- for x in (0,1,2,3,4):
+ for x in (0,1,2,3,4,5):
db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
@@ -649,7 +649,7 @@
for dn in inc_dirs:
std_variants.append(os.path.join(dn, 'db3'))
std_variants.append(os.path.join(dn, 'db4'))
- for x in (0,1,2,3,4):
+ for x in (0,1,2,3,4,5):
std_variants.append(os.path.join(dn, "db4%d"%x))
std_variants.append(os.path.join(dn, "db4.%d"%x))
for x in (2,3):

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

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

3
Python-2.5.tar.bz2
View File

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

3
html-2.5.1.tar.bz2 Normal file
View File

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

3
html-2.5.tar.bz2
View File

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

3
pdf-a4-2.5.1.tar.bz2 Normal file
View File

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

3
pdf-a4-2.5.tar.bz2
View File

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

3
pdf-letter-2.5.1.tar.bz2 Normal file
View File

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

3
pdf-letter-2.5.tar.bz2
View File

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

22
python-2.5-https_warn.patch Normal file
View File

@ -0,0 +1,22 @@
--- Lib/urllib.py
+++ Lib/urllib.py
@@ -28,6 +28,7 @@
import time
import sys
from urlparse import urljoin as basejoin
+import warnings
__all__ = ["urlopen", "URLopener", "FancyURLopener", "urlretrieve",
"urlcleanup", "quote", "quote_plus", "unquote", "unquote_plus",
@@ -1281,7 +1282,10 @@
for name, value in os.environ.items():
name = name.lower()
if value and name[-6:] == '_proxy':
- proxies[name[:-6]] = value
+ if name == 'https_proxy':
+ warnings.warn ("urllib can't handle https proxies, your https_proxy setting will not work", RuntimeWarning, stacklevel=2)
+ else:
+ proxies[name[:-6]] = value
return proxies
if sys.platform == 'darwin':

13
python-2.5c1-dirs-fix.patch
View File

@ -1,13 +0,0 @@
--- setup.py
+++ setup.py
@@ -247,6 +247,10 @@
add_dir_to_list(self.compiler.library_dirs, '/usr/local/' + sys.lib)
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ # ensure that "." (i.e. location of new libpython.so) is always used. this fixes
+ # a build problem with our Python-2.3.3-dirs.patch. i'll look into it later
+ add_dir_to_list(self.compiler.library_dirs, '.')
+
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
# We must get the values from the Makefile and not the environment

75
python-2.5c1-distutils-bdist-rpm.patch
View File

@ -1,75 +0,0 @@
--- Python-2.5c1/Lib/distutils/command/bdist_rpm.py
+++ Python-2.5c1/Lib/distutils/command/bdist_rpm.py
@@ -337,37 +337,47 @@
if not self.keep_temp:
rpm_cmd.append('--clean')
rpm_cmd.append(spec_path)
+ # Determine the binary rpm names that should be built out of this spec
+ # file
+ # Note that some of these may not be really built (if the file
+ # list is empty)
+ nvr_string = "%{name}-%{version}-%{release}"
+ src_rpm = nvr_string + ".src.rpm"
+ non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
+ q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
+ src_rpm, non_src_rpm, spec_path)
+
+ out = os.popen(q_cmd)
+ binary_rpms = []
+ source_rpm = None
+ while 1:
+ line = out.readline()
+ if not line:
+ break
+ l = string.split(string.strip(line))
+ assert(len(l) == 2)
+ binary_rpms.append(l[1])
+ # The source rpm is named after the first entry in the spec file
+ if source_rpm is None:
+ source_rpm = l[0]
+
+ status = out.close()
+ if status:
+ raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
self.spawn(rpm_cmd)
- # XXX this is a nasty hack -- we really should have a proper way to
- # find out the names of the RPM files created; also, this assumes
- # that RPM creates exactly one source and one binary RPM.
if not self.dry_run:
if not self.binary_only:
- srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
- assert len(srpms) == 1, \
- "unexpected number of SRPM files found: %s" % srpms
- dist_file = ('bdist_rpm', 'any',
- self._dist_path(srpms[0]))
- self.distribution.dist_files.append(dist_file)
- self.move_file(srpms[0], self.dist_dir)
+ srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
+ assert(os.path.exists(srpm))
+ self.move_file(srpm, self.dist_dir)
if not self.source_only:
- rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
- debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'],
- "*/*debuginfo*.rpm"))
- if debuginfo:
- rpms.remove(debuginfo[0])
- assert len(rpms) == 1, \
- "unexpected number of RPM files found: %s" % rpms
- dist_file = ('bdist_rpm', get_python_version(),
- self._dist_path(rpms[0]))
- self.distribution.dist_files.append(dist_file)
- self.move_file(rpms[0], self.dist_dir)
- if debuginfo:
- dist_file = ('bdist_rpm', get_python_version(),
- self._dist_path(debuginfo[0]))
- self.move_file(debuginfo[0], self.dist_dir)
+ for rpm in binary_rpms:
+ rpm = os.path.join(rpm_dir['RPMS'], rpm)
+ if os.path.exists(rpm):
+ self.move_file(rpm, self.dist_dir)
# run()
def _dist_path(self, path):

5
python-doc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 24 18:51:37 CEST 2007 - jmatejek@suse.cz
- updated to version 2.5.1
-------------------------------------------------------------------
Tue Sep 19 18:30:50 CEST 2006 - jmatejek@suse.cz

8
python-doc.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package python-doc (Version 2.5)
# spec file for package python-doc (Version 2.5.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -16,8 +16,8 @@ License: Python Copyright
Group: Development/Languages/Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation for Python.
Version: 2.5
Release: 38
Version: 2.5.1
Release: 1
%define pyver %{version}
BuildArch: noarch
%define tarname Python-%{pyver}
@ -96,6 +96,8 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{pyname}/paper-letter
%changelog
* Thu May 24 2007 - jmatejek@suse.cz
- updated to version 2.5.1
* Tue Sep 19 2006 - jmatejek@suse.cz
- updated to version 2.5 final, going into STABLE dist
* Wed Sep 13 2006 - jmatejek@suse.cz

10
python.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu May 24 18:47:20 CEST 2007 - jmatejek@suse.cz
- update to 2.5.1
- bugfix only release, over 150 bugs fixed
- fixes off-by-one memory leak in _localemodule.c
(#276889, CVE-2007-2052)
- unnecessary patches removed, minor build cleanup
- warns when attempting to use https proxy (#214983)
-------------------------------------------------------------------
Tue May 22 01:13:28 CEST 2007 - ro@suse.de

34
python.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package python (Version 2.5)
# spec file for package python (Version 2.5.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,14 +12,15 @@
Name: python
BuildRequires: blt db-devel emacs-nox gcc-c++ gdbm-devel gmp-devel libbz2-devel ncurses-devel openssl-devel readline-devel sqlite-devel tk-devel xorg-x11-devel
Requires: openssl >= 0.9.8e
URL: http://www.python.org/
License: X11/MIT
Group: Development/Languages/Python
Autoreqprov: on
Obsoletes: python-nothreads python21
Summary: Python Interpreter
Version: 2.5
Release: 50
Version: 2.5.1
Release: 1
%define tarname Python-%{version}
Source0: %{tarname}.tar.bz2
Source6: README.SUSE
@ -32,14 +33,11 @@ Source10: python.csh
Source13: distutils.cfg
Patch01: Python-2.3.3-dirs.patch
Patch10: python-distutils-rpm-8.patch
Patch13: Python-2.4-readline.patch
Patch21: Python-2.5c1-multilib.patch
Patch22: python-2.5c1-distutils-bdist-rpm.patch
Patch23: ssl-compat.diff
Patch25: python-2.4.2-canonicalize2.patch
Patch26: python-2.4-localpath.patch
Patch27: python-2.5c1-dirs-fix.patch
Patch28: Python-2.5-db45.patch
Patch27: python-2.5-https_warn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define python_version %(echo %{version} | head -c 3)
%define idle_name idle
@ -120,9 +118,9 @@ Authors:
%package tk
Provides: pyth_tk python_tkinter_lib pyth_tkl python-tkinter
%ifarch %ix86
Provides: _tkinter.so
%endif
#%ifarch %ix86
#Provides: _tkinter.so
#%endif
Obsoletes: pyth_tk pyth_tkl python-tkinter
Requires: python = %{version}
Summary: TkInter - Python Tk Interface
@ -193,20 +191,17 @@ Python2.x, it is part of the core Python distribution.
# patching
%patch01
%patch10 -p1
#%patch13
%patch21 -p1
%patch22 -p1
%patch23
%patch25
%patch26
%patch27
%patch28
# some cleanup
find . -name .cvsignore -type f -print0 | xargs -0 rm -f
find . -name CVS -type d -print0 | xargs -0 rm -rf
# replace rest of /usr/local/bin/python with /usr/bin/env python
find . -name '*.py' -type f -print0 | xargs -0 grep -l '^#! \?/usr/.*bin/python' | xargs sed -r -i -e 's@^#![[:space:]]*/usr/(local/)?bin/python@#!/usr/bin/env python@'
# the grep inbetween is apparently needed, as sed changes -something- it should not (even according to itself) - maybe a bug in sed? or am I overlooking something?
find . -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! ?(/usr/.*bin/)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/)?python@#!/usr/bin/env python@'
# the grep inbetween makes it a) faster and b) compile at all :p
%build
########################################
@ -244,10 +239,10 @@ make %{?jobs:-j%jobs} DESTDIR=$RPM_BUILD_ROOT
# test_file fails in autobuild env. probably a bug in python, will fix/report
# test_nis fails in autobuild env. probably a misconfiguration of mbuild servers
EXCLUDE="-x test_file -x test_nis"
#EXCLUDE=""
%ifarch ia64
EXCLUDE="$EXCLUDE -x test_mmap -x test_threaded_import"
%endif
ulimit -c 100000000
make test TESTOPTS="-l $EXCLUDE"
# test bsddb:
#make test TESTOPTS="-l -u bsddb"
@ -478,6 +473,13 @@ rm -rf $RPM_BUILD_ROOT
%attr(755, root, root) %{_bindir}/smtpd.py
%changelog
* Thu May 24 2007 - jmatejek@suse.cz
- update to 2.5.1
- bugfix only release, over 150 bugs fixed
- fixes off-by-one memory leak in _localemodule.c
(#276889, CVE-2007-2052)
- unnecessary patches removed, minor build cleanup
- warns when attempting to use https proxy (#214983)
* Tue May 22 2007 - ro@suse.de
- make setup.py accept db-4.5
* Thu Mar 29 2007 - aj@suse.de