fixes backspace problem in python and gdb terminal

bootstrap-bundle.spec

@@ -5,7 +5,7 @@
 
 BuildRequires: gcc
 BuildRequires: bz2lib-bootstrap db6-bootstrap file-bootstrap libxml2-bootstrap lua-bootstrap nspr-bootstrap nss-bootstrap
-BuildRequires: openssl-bootstrap popt-bootstrap zlib-bootstrap xz-bootstrap ncurses-bootstrap readline-bootstrap libarchive-bootstrap
+BuildRequires: openssl-bootstrap popt-bootstrap zlib-bootstrap xz-bootstrap readline-bootstrap libarchive-bootstrap
 
 %define keep_archives true
 %define is64bit %(case %{cmsplatf} in (*_amd64_*|*_mic_*|*_aarch64_*|*_ppc64le_*) echo 1 ;; (*) echo 0 ;; esac)
@@ -54,7 +54,7 @@ find %{i}/lib -type f ! -name '*.a' -writable -exec %{strip} {} \;
 # RPM requires it to generate requires/provides also (otherwise it ignores the files)
 find %{i}/lib -type f | xargs chmod 0755
 
-mv %{i}/lib/lib{lua,magic,form,menu,ncurses,ncurses++,panel,history,readline,archive}.a %{i}/tmp
+mv %{i}/lib/lib{lua,magic,history,readline,archive}.a %{i}/tmp
 rm -f %{i}/lib/*.{l,}a
 mv %{i}/tmp/lib* %{i}/lib/
 rm -rf %{i}/tmp

gdb-7.10-tgetent-in-ncurses.patch → gdb-7.11-set-autoconf-version.patch

@@ -3,24 +3,11 @@ index 52bd1c3..8b954d3 100644
 --- a/config/override.m4
 +++ b/config/override.m4
 @@ -29,7 +29,7 @@ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
- 
+
  dnl Ensure exactly this Autoconf version is used
  m4_ifndef([_GCC_AUTOCONF_VERSION],
 -  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
 +  [m4_define([_GCC_AUTOCONF_VERSION], [2.69])])
- 
+
  dnl Test for the exact version when AC_INIT is expanded.
  dnl This allows to update the tree in steps (for testing)
-diff --git a/gdb/configure.ac b/gdb/configure.ac
-index a40860a..92bc139 100644
---- a/gdb/configure.ac
-+++ b/gdb/configure.ac
-@@ -620,7 +620,7 @@ case $host_os in
- esac
-
- # These are the libraries checked by Readline.
--AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses])
-+AC_SEARCH_LIBS(tgetent, [curses ncurses])
-
- if test "$ac_cv_search_tgetent" = no; then
-   CONFIG_OBS="$CONFIG_OBS stub-termcap.o"

gdb.spec

@@ -3,9 +3,9 @@ Source: http://ftp.gnu.org/gnu/%{n}/%{n}-%{realversion}.tar.gz
 
 Patch0: gdb-7.11-fix-PYTHONHOME
 Patch1: gdb-disable-makeinfo
-Patch2: gdb-7.10-tgetent-in-ncurses
+Patch2: gdb-7.11-set-autoconf-version
 
-Requires: python ncurses zlib xz expat
+Requires: python zlib xz expat
 
 BuildRequires: autotools
 
@@ -31,8 +31,8 @@ popd
             --with-python=${PYTHON_ROOT} \
             --with-lzma=yes \
             --with-liblzma-prefix=${XZ_ROOT} \
-            LDFLAGS="-L${PYTHON_ROOT}/lib -L${NCURSES_ROOT}/lib -L${ZLIB_ROOT}/lib -L${EXPAT_ROOT}/lib -L${XZ_ROOT}/lib" \
-            CFLAGS="-Wno-error=strict-aliasing -I${PYTHON_ROOT}/include -I${NCURSES_ROOT}/include -I${ZLIB_ROOT}/include -I${EXPAT_ROOT}/include -I${XZ_ROOT}/include" \
+            LDFLAGS="-L${PYTHON_ROOT}/lib -L${ZLIB_ROOT}/lib -L${EXPAT_ROOT}/lib -L${XZ_ROOT}/lib" \
+            CFLAGS="-Wno-error=strict-aliasing -I${PYTHON_ROOT}/include -I${ZLIB_ROOT}/include -I${EXPAT_ROOT}/include -I${XZ_ROOT}/include" \
             MAKEINFO=true
 make %makeprocesses
 

python.spec

@@ -7,11 +7,11 @@
 %{expand:%%define python_major_version %(echo %realversion | cut -d. -f1,2)}
 
 Requires: expat bz2lib db6 gdbm openssl libffi
-Requires: zlib sqlite readline ncurses 
+Requires: zlib sqlite readline
 
 # FIXME: readline, crypt 
 # FIXME: gmp, panel, tk/tcl, x11
-%define tag 9cd0df98a9579245343d5f37084b192f03836ee5
+%define tag 8a163e2e9d3442f6e2239cbfa1b36dba7529256b
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/cpython.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
@@ -49,14 +49,13 @@ done
 
 mkdir -p %{i}/{include,lib,bin}
 
-dirs="${EXPAT_ROOT} ${BZ2LIB_ROOT} ${DB6_ROOT} ${GDBM_ROOT} ${OPENSSL_ROOT} ${LIBFFI_ROOT} ${ZLIB_ROOT} ${SQLITE_ROOT} ${READLINE_ROOT} ${NCURSES_ROOT}"
+dirs="${EXPAT_ROOT} ${BZ2LIB_ROOT} ${DB6_ROOT} ${GDBM_ROOT} ${OPENSSL_ROOT} ${LIBFFI_ROOT} ${ZLIB_ROOT} ${SQLITE_ROOT} ${READLINE_ROOT}"
 
 # We need to export it because setup.py now uses it to determine the actual
 # location of DB4, this was needed to avoid having it picked up from the system.
 export DB6_ROOT
 export LIBFFI_ROOT
 export READLINE_ROOT
-export NCURSES_ROOT
 
 # Python's configure parses LDFLAGS and CPPFLAGS to look for aditional library and include directories
 echo $dirs
@@ -65,7 +64,7 @@ CPPFLAGS=""
 for d in $dirs; do
   LDFLAGS="$LDFLAGS -L$d/lib -L$d/lib64"
 done
-for d in $dirs $READLINE_ROOT $NCURSES_ROOT; do
+for d in $dirs $READLINE_ROOT; do
   CPPFLAGS="$CPPFLAGS -I$d/include"
 done
 export LDFLAGS
@@ -128,7 +127,6 @@ make
 export DB6_ROOT
 export LIBFFI_ROOT
 export READLINE_ROOT
-export NCURSES_ROOT
 
 make install
 %define pythonv %(echo %realversion | cut -d. -f 1,2)

sqlite.spec

@@ -1,16 +1,16 @@
 ### RPM external sqlite 3.12.2
 Source: https://www.sqlite.org/2016/sqlite-autoconf-3120200.tar.gz
 
-Requires: readline ncurses
+Requires: readline
 
 %prep
 %setup -n sqlite-autoconf-3120200
 
 %build
 ./configure --build="%{_build}" --host="%{_host}" --prefix=%{i} \
             --disable-static --disable-dependency-tracking \
-            CPPFLAGS="-I${READLINE_ROOT}/include -I${NCURSES_ROOT}/include" \
-            CFLAGS="-L${READLINE_ROOT}/lib -L${NCURSES_ROOT}/lib"
+            CPPFLAGS="-I${READLINE_ROOT}/include" \
+            CFLAGS="-L${READLINE_ROOT}/lib"
 make %{makeprocesses}
 
 %install