From 7de6b4cc7fa33864d165d00a6eb329bdad3b301e Mon Sep 17 00:00:00 2001
From: lisu <lisu@pld-linux.org>
Date: Tue, 10 Jan 2012 15:49:58 +0000
Subject: [PATCH] - no more separated libtinfo(w)

Changed files:
    irssi-tinfo.patch -> 1.3
    irssi.spec -> 1.183
---
 irssi-tinfo.patch | 26 --------------------------
 irssi.spec        | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 irssi-tinfo.patch

diff --git a/irssi-tinfo.patch b/irssi-tinfo.patch
deleted file mode 100644
index 3af1256..0000000
--- a/irssi-tinfo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- irssi-0.8.11/curses.m4.orig	2007-06-07 01:22:01.709666033 +0200
-+++ irssi-0.8.11/curses.m4	2007-06-07 01:24:43.928073732 +0200
-@@ -232,17 +232,17 @@
- AC_DEFUN(AC_SEARCH_NCURSES, [
-     AC_CHECKING("location of ncurses.h file")
- 
--    AC_NCURSES(/usr/include, ncurses.h, -lncurses,,
-+    AC_NCURSES(/usr/include, ncurses.h, -lncurses -ltinfo,,
- 	       [ncurses in /usr/include])
--    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses,
-+    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses -ltinfo, -I/usr/include/ncurses,
- 	       [ncurses in /usr/include/ncurses])
--    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include,
-+    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include,
- 	       [ncurses in /usr/local/include])
--    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses,
-+    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include/ncurses,
- 	       [ncurses in /usr/local/include/ncurses])
--    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES,
-+    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses -ltinfo, -I/usr/local/include/ncurses -DRENAMED_NCURSES,
- 	       [renamed ncurses in /usr/local/include/ncurses])
--    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
-+    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses -ltinfo, -I/usr/include/ncurses -DRENAMED_NCURSES,
- 	       [renamed ncurses in /usr/include/ncurses])
- 
-     dnl
diff --git a/irssi.spec b/irssi.spec
index 88d1352..8f661ad 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -29,14 +29,13 @@ Source2:	%{name}.png
 Source3:	%{name}-idea-%{idea_ver}.tar.gz
 # Source3-md5:	c326efe317b8f67593a3cd46d5557280
 Patch0:		%{name}-dcc-send-limit.patch
-Patch1:		%{name}-tinfo.patch
-Patch2:		%{name}-home_etc.patch
-Patch3:		%{name}-idea-listlen.patch
-Patch4:		%{name}-gcc4.patch
-Patch5:		%{name}-dynamic.patch
-Patch6:		%{name}-invalid_free.patch
-Patch7:		%{name}-color_support_for_gui_entry.patch
-Patch8:		%{name}-libs-nopoison.patch
+Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-idea-listlen.patch
+Patch3:		%{name}-gcc4.patch
+Patch4:		%{name}-dynamic.patch
+Patch5:		%{name}-invalid_free.patch
+Patch6:		%{name}-color_support_for_gui_entry.patch
+Patch7:		%{name}-libs-nopoison.patch
 URL:		http://www.irssi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -98,13 +97,12 @@ Ten pakiet zawiera wtyczkę do Irssi z szyfrowaniem IDEA.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %if %{with dynamic}
-%patch5 -p1
+%patch4 -p1
 %endif
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
+%patch5 -p1
+%patch6 -p0
+%patch7 -p1
 
 echo 'AC_DEFUN([AM_PATH_GLIB],[:])' > glib1.m4
 
-- 
2.44.0