OBS User unknown 2008-06-25 20:15:15 +00:00 committed by Git OBS Bridge
parent cccc118b27
commit 92d03071ff
4 changed files with 35 additions and 4 deletions

View File

@ -0,0 +1,24 @@
--- configure.in
+++ configure.in
@@ -3153,9 +3153,18 @@ then
fi
# 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]), , )
+AC_MSG_CHECKING([for rl_pre_input_hook in -lreadline])
+AC_CACHE_VAL(ac_cv_have_rl_re_input_hook, [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
+#include <readline/readline.h>],
+ [return rl_pre_input_hook != 0])],
+ ac_cv_have_rl_re_input_hook=yes,
+ ac_cv_have_rl_re_input_hook=no)])
+AC_MSG_RESULT($ac_cv_have_rl_re_input_hook)
+if test "$ac_cv_have_rl_re_input_hook" = yes; then
+ AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
+ [Define if you have readline 4.0])
+fi
# check for readline 4.2
AC_CHECK_LIB(readline, rl_completion_matches,

View File

@ -8,7 +8,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: python-doc
@ -18,7 +17,7 @@ Group: Development/Languages/Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation for Python.
Version: 2.5.1
Release: 69
Release: 77
%define pyver 2.5.2
BuildArch: noarch
%define tarname Python-%{pyver}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 13 10:07:02 CEST 2008 - schwab@suse.de
- Fix configure script.
-------------------------------------------------------------------
Thu Apr 24 19:37:14 CEST 2008 - matejcik@suse.cz

View File

@ -8,7 +8,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: python
@ -21,7 +20,7 @@ AutoReqProv: on
Obsoletes: python-nothreads python21 python-elementtree python-sqlite
Summary: Python Interpreter
Version: 2.5.2
Release: 19
Release: 28
%define tarname Python-%{version}
Source0: %{tarname}.tar.bz2
Source6: README.SUSE
@ -44,6 +43,7 @@ Patch31: python-2.5.2-fwrapv.patch
Patch32: disable-dns-test.diff
Patch33: python-2.5.2-from-string-and-size.patch
Patch34: python-2.5.2-docdirs.patch
Patch35: python-2.5.2-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define python_version %(echo %{version} | head -c 3)
%define idle_name idle
@ -217,6 +217,7 @@ Python2.x, it is part of the core Python distribution.
%endif
%patch33 -p2
%patch34
%patch35
# some cleanup
find . -name .cvsignore -type f -print0 | xargs -0 rm -f
find . -name CVS -type d -print0 | xargs -0 rm -rf
@ -490,6 +491,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/python2
%changelog
* Fri Jun 13 2008 schwab@suse.de
- Fix configure script.
* Thu Apr 24 2008 matejcik@suse.cz
- proper path for html documentation from python-doc,
help text mentioning python-doc package in pydoc