- as-needed tinfo

Changed files:
    mutt-ac.patch -> 1.1
    mutt.spec -> 1.232

diff --git a/mutt-ac.patch b/mutt-ac.patch
new file mode 100644 (file)
index 0000000..9520b18
--- /dev/null
+++ b/mutt-ac.patch
@@ -0,0 +1,19 @@
+--- mutt-1.5.21/configure.ac~  2010-10-06 19:50:24.570430998 +0200
++++ mutt-1.5.21/configure.ac   2010-10-06 20:17:25.192640340 +0200
+@@ -270,12 +270,13 @@
+ 
+       AC_CHECK_FUNC(initscr,,[
+       cf_ncurses="ncurses"
+-      for lib in ncurses ncursesw
++      cf_tinfo="tinfo"
++      for lib in "" w
+       do
+-              AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
++              AC_CHECK_LIB(ncurses$lib, waddnwstr, [cf_ncurses="ncurses$lib"; cf_tinfo="tinfo$lib"; break])
+       done
+         AC_CHECK_LIB($cf_ncurses, initscr,
+-                [MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
++                [MUTTLIBS="$MUTTLIBS -l$cf_ncurses -l$cf_tinfo"
+               
+                 if test "$cf_ncurses" = ncursesw; then
+                       AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])

diff --git a/mutt.spec b/mutt.spec
index 1fc3833c4933ae886a8755bb90fbf1ed0be680f2..988625bd3e5b31100ac00ced0ab678b26a30cacd 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -57,6 +57,7 @@ Patch18:      %{name}-folder_columns.patch
 Patch19:       %{name}-imap_recent.patch
 Patch20:       %{name}-Muttrc.head.patch
 Patch21:       %{name}-smime.rc.patch
+Patch22:       %{name}-ac.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -162,6 +163,7 @@ Mutt - це невеликий, але потужний повноекранни
 %{?with_imap_recent:%patch19 -p1}
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}