packages: abook/abook.spec, abook/abook-tinfo_link.patch (NEW) - up to 0.6....

[atler]

Author: atler                        Date: Tue Oct 19 11:46:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.6.0pre2
- fix linking with tinfow
- add vCard import patch
- 0.5.6-01_editor patch applied upstream

---- Files affected:
packages/abook:
   abook.spec (1.45 -> 1.46) , abook-tinfo_link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/abook/abook.spec
diff -u packages/abook/abook.spec:1.45 packages/abook/abook.spec:1.46
--- packages/abook/abook.spec:1.45	Mon Feb 12 22:23:46 2007
+++ packages/abook/abook.spec	Tue Oct 19 13:46:18 2010
@@ -1,15 +1,18 @@
 # $Revision$, $Date$
+%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
@@ -27,9 +30,10 @@
 do użycia z programem pocztowym mutt.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rel}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -63,6 +67,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2010/10/19 11:46:18  atler
+- up to 0.6.0pre2
+- fix linking with tinfow
+- add vCard import patch
+- 0.5.6-01_editor patch applied upstream
+
 Revision 1.45  2007/02/12 21:23:46  glen
 - tabs in preamble
 

================================================================
Index: packages/abook/abook-tinfo_link.patch
diff -u /dev/null packages/abook/abook-tinfo_link.patch:1.1
--- /dev/null	Tue Oct 19 13:46:24 2010
+++ packages/abook/abook-tinfo_link.patch	Tue Oct 19 13:46:18 2010
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abook/abook.spec?r1=1.45&r2=1.46&f=u