From f067d77fca805894aa140178344b64ec3a54fd04 Mon Sep 17 00:00:00 2001
From: Jan Palus <jan.palus@gmail.com>
Date: Tue, 19 Oct 2010 11:46:18 +0000
Subject: [PATCH 1/1] - up to 0.6.0pre2 - fix linking with tinfow - add vCard
 import patch - 0.5.6-01_editor patch applied upstream

Changed files:
    abook-tinfo_link.patch -> 1.1
    abook.spec -> 1.46
---
 abook-tinfo_link.patch | 19 +++++++++++++++++++
 abook.spec             | 16 ++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 abook-tinfo_link.patch

diff --git a/abook-tinfo_link.patch b/abook-tinfo_link.patch
new file mode 100644
index 0000000..26d33c3
--- /dev/null
+++ b/abook-tinfo_link.patch
@@ -0,0 +1,19 @@
+--- configure.in.orig	2010-10-19 13:37:19.861388909 +0200
++++ configure.in	2010-10-19 13:37:34.211388910 +0200
+@@ -84,14 +84,14 @@
+ 	fi])
+ 
+ AC_CHECK_LIB(ncursesw, initscr,
+-	[LIBS="$LIBS -lncursesw"
++	[LIBS="$LIBS -lncursesw -ltinfow"
+ 	if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+ 		CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+ 	fi
+ 	AC_CHECK_HEADERS(ncurses.h)],[
+ 	ac_widec_possible=no
+ 	AC_CHECK_LIB(ncurses, initscr,
+-		[LIBS="$LIBS -lncurses"
++		[LIBS="$LIBS -lncurses -ltinfo"
+ 		if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+ 			CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ 		fi
diff --git a/abook.spec b/abook.spec
index 6ff3509..9e539f8 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,14 +1,17 @@
+%define		_rel	pre2
+#
 Summary:	Text-based addressbook program for mutt
 Summary(pl.UTF-8):	Tekstowa książka adresowa dla klienta pocztowego mutt
 Name:		abook
-Version:	0.5.6
-Release:	1
+Version:	0.6.0
+Release:	0.%{_rel}.1
 License:	GPL
 Group:		Applications/Mail
-Source0:	http://dl.sourceforge.net/abook/%{name}-%{version}.tar.gz
-# Source0-md5:	87d25df96864a7c507a4965e6d1da49d
+Source0:	http://abook.sourceforge.net/devel/%{name}-%{version}%{_rel}.tar.gz
+# Source0-md5:	1e4a7210b3507db7b3d47ee7a2457934
 Patch0:		%{name}-home_etc.patch
-Patch1:		http://abook.sourceforge.net/patches/0.5.6-01_editor
+Patch1:		%{name}-tinfo_link.patch
+Patch2:		http://abook.sourceforge.net/patches/abook_vcard_import.patch
 URL:		http://abook.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,9 +29,10 @@ Abook to pracująca w trybie tekstowym książka adresowa zaprojektowana
 do użycia z programem pocztowym mutt.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rel}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
 %{__gettextize}
-- 
2.44.0