diff --git a/Python-2.3.3-dirs.patch b/Python-2.3.3-dirs.patch index c42f7c3..7189bf5 100644 --- a/Python-2.3.3-dirs.patch +++ b/Python-2.3.3-dirs.patch @@ -1,9 +1,11 @@ # force use of directories passed to configure script ---- Makefile.pre.in 2003-09-20 12:50:28.000000000 +0200 -+++ Makefile.pre.in 2003-10-02 11:05:14.000000000 +0200 -@@ -78,12 +78,12 @@ - exec_prefix= @exec_prefix@ +Index: Makefile.pre.in +=================================================================== +--- Makefile.pre.in.orig ++++ Makefile.pre.in +@@ -86,12 +86,12 @@ exec_prefix= @exec_prefix@ + datarootdir= @datarootdir@ # Expanded directories -BINDIR= $(exec_prefix)/bin diff --git a/python-2.6.2-readline.patch b/python-2.6.2-readline.patch new file mode 100644 index 0000000..4b5f85b --- /dev/null +++ b/python-2.6.2-readline.patch @@ -0,0 +1,23 @@ +--- Modules/readline.c 2008-11-04 12:43:31.000000000 -0800 ++++ Modules/readline.c 2009-04-22 15:50:49.000000000 -0700 +@@ -759,6 +759,10 @@ + static char ** + flex_complete(char *text, int start, int end) + { ++#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER ++ rl_completion_append_character ='\0'; ++ rl_completion_suppress_append = 0; ++#endif + Py_XDECREF(begidx); + Py_XDECREF(endidx); + begidx = PyInt_FromLong((long) start); +@@ -799,11 +803,8 @@ + rl_completer_word_break_characters = + strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"); + /* All nonalphanums except '.' */ +-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER +- rl_completion_append_character ='\0'; +-#endif + + begidx = PyInt_FromLong(0L); + endidx = PyInt_FromLong(0L); diff --git a/python-base.changes b/python-base.changes index a7f8108..b6a7d70 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 28 18:03:27 UTC 2009 - crrodriguez@opensuse.org + +- python-devel Requires glibc-devel + ------------------------------------------------------------------- Fri Sep 4 20:16:42 CEST 2009 - matejcik@suse.cz diff --git a/python-base.spec b/python-base.spec index 0ddd0cc..5ab5f83 100644 --- a/python-base.spec +++ b/python-base.spec @@ -33,7 +33,7 @@ Obsoletes: python-64bit # Summary: Python Interpreter base package Version: 2.6.2 -Release: 5 +Release: 6 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source1: macros.python @@ -71,7 +71,7 @@ Authors: %package -n python-devel License: Python License .. -Requires: python-base = %{version} +Requires: python-base = %{version} glibc-devel Summary: Include Files and Libraries Mandatory for Building Python Modules Group: Development/Languages/Python AutoReqProv: on diff --git a/python-doc.spec b/python-doc.spec index ce62bd7..9a017cf 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -24,7 +24,7 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.6 -Release: 15 +Release: 16 %define pyver 2.6.2 BuildArch: noarch %define tarname Python-%{pyver} diff --git a/python.changes b/python.changes index b29ec19..e112414 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Nov 4 19:04:16 CET 2009 - matejcik@suse.cz + +- readline shouldn't append space after completion (bnc#551715, + python bug 5833) + +------------------------------------------------------------------- +Tue Nov 3 19:13:42 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Sep 8 16:11:33 CEST 2009 - max@suse.de diff --git a/python.spec b/python.spec index fb4c8d8..7e599ab 100644 --- a/python.spec +++ b/python.spec @@ -35,7 +35,7 @@ Obsoletes: python-64bit Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.6.2 -Release: 5 +Release: 6 Requires: python-base = %{version} %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 @@ -54,6 +54,7 @@ Patch31: python-2.5.2-fwrapv.patch Patch35: python-2.5.2-configure.patch Patch38: python-2.6b3-curses-panel.patch Patch39: python-2.6.2-ssl_handshake_timeout.patch +Patch40: python-2.6.2-readline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) %define idle_name idle @@ -189,6 +190,7 @@ Authors: %patch38 %endif %patch39 +%patch40 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf