diff --git a/libtinfo.diff b/libtinfo.diff new file mode 100644 index 0000000..cbadf80 --- /dev/null +++ b/libtinfo.diff @@ -0,0 +1,30 @@ +--- aclocal.m4 ++++ aclocal.m4 2011-11-17 09:31:16.663145702 +0000 +@@ -621,10 +621,10 @@ AC_CACHE_CHECK(for $cf_test_message func + cf_save_LIBS="$LIBS" + cf_cv_lib_tgetent=no + if test "$cf_full_tgetent" = yes ; then +- cf_TERMLIB="otermcap termcap termlib ncurses curses" ++ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses" + cf_TERMTST="buffer[[0]] == 0" + else +- cf_TERMLIB="termlib ncurses curses" ++ cf_TERMLIB="termlib tinfo ncurses curses" + cf_TERMTST="0" + fi + for cf_termlib in '' $cf_TERMLIB ; do +--- configure ++++ configure 2011-11-17 09:47:29.795646131 +0000 +@@ -5600,10 +5600,10 @@ else + cf_save_LIBS="$LIBS" + cf_cv_lib_tgetent=no + if test "$cf_full_tgetent" = yes ; then +- cf_TERMLIB="otermcap termcap termlib ncurses curses" ++ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses" + cf_TERMTST="buffer[0] == 0" + else +- cf_TERMLIB="termlib ncurses curses" ++ cf_TERMLIB="termlib tinfo ncurses curses" + cf_TERMTST="0" + fi + for cf_termlib in '' $cf_TERMLIB ; do diff --git a/xterm.changes b/xterm.changes index f74aa6e..fdd962e 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 17 10:54:07 UTC 2011 - werner@suse.de + +- Use libtinfo if available otherwise libncurses (required due + bnc #729226) + ------------------------------------------------------------------- Wed Oct 19 01:47:15 UTC 2011 - pcerny@suse.com diff --git a/xterm.spec b/xterm.spec index 36a7212..a6e6463 100644 --- a/xterm.spec +++ b/xterm.spec @@ -50,6 +50,7 @@ Patch2: p_xterm-sigwinch.diff Patch3: bug-246573-tentative-patch.diff Patch4: desktop.diff Patch5: xterm-disallow-window-and-fonts-ops.patch +Patch6: libtinfo.diff Patch293793: bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +64,7 @@ This package contains the basic X.Org terminal program. %patch3 -p1 %patch4 -p0 %patch5 -p0 +%patch6 -p0 %patch293793 -p1 cp $RPM_SOURCE_DIR/*bdf.bz2 . bunzip2 *.bdf.bz2