- no more separated libtinfo(w)

Changed files:
    mutt-ac.patch -> 1.2
    mutt.spec -> 1.243

diff --git a/mutt-ac.patch b/mutt-ac.patch
deleted file mode 100644 (file)
index 9520b18..0000000
--- a/mutt-ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 93f563bdb7179d9966181268adbfa6df40b12cad..fdb011de42eb334bcba30a9afc157feacdb6c5b4 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -57,9 +57,8 @@ Patch18:      %{name}-folder_columns.patch
 Patch19:       %{name}-imap_recent.patch
 Patch20:       %{name}-Muttrc.head.patch
 Patch21:       %{name}-smime.rc.patch
-Patch22:       %{name}-ac.patch
-Patch23:       %{name}-sidebar.patch
-Patch24:       %{name}-imap_fast_trash.patch
+Patch22:       %{name}-sidebar.patch
+Patch23:       %{name}-imap_fast_trash.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -169,7 +168,6 @@ Mutt - це невеликий, але потужний повноекранни
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}