packages: bird/bird.spec, bird/bird-tinfo.patch (NEW) - up to 1.2.5

[arekm]

Author: arekm                        Date: Thu Feb 17 17:02:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.2.5

---- Files affected:
packages/bird:
   bird.spec (1.44 -> 1.45) , bird-tinfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bird/bird.spec
diff -u packages/bird/bird.spec:1.44 packages/bird/bird.spec:1.45
--- packages/bird/bird.spec:1.44	Mon Mar  8 20:23:20 2010
+++ packages/bird/bird.spec	Thu Feb 17 18:02:23 2011
@@ -9,18 +9,19 @@
 Summary:	The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
-Version:	1.2.1
+Version:	1.2.5
 Release:	1
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz
-# Source0-md5:	e158bd0a72e345841e39764975ee1d21
+# Source0-md5:	06f330da3290018335d0761549d90226
 Source1:	%{name}-ipv4.init
 Source2:	%{name}-ipv4.sysconfig
 Source3:	%{name}-ipv6.init
 Source4:	%{name}-ipv6.sysconfig
 Source5:	ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
-# Source5-md5:	a82474c87f5c79f29a6c9088f9dfe30a
+# Source5-md5:	5ff7d5fb0501c9ebf05df0756efe801e
+Patch0:		%{name}-tinfo.patch
 URL:		http://bird.network.cz/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -103,12 +104,13 @@
 
 %prep
 %setup -q -a 5
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.* tools
 %{__autoconf}
 
-export CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+export CFLAGS="%{rpmcflags} -I%{_includedir}/ncursesw"
 
 %if %{with ipv6}
 %configure \
@@ -206,6 +208,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2011/02/17 17:02:23  arekm
+- up to 1.2.5
+
 Revision 1.44  2010/03/08 19:23:20  gotar
 - 64bit patch not needed anymore
 

================================================================
Index: packages/bird/bird-tinfo.patch
diff -u /dev/null packages/bird/bird-tinfo.patch:1.1
--- /dev/null	Thu Feb 17 18:02:28 2011
+++ packages/bird/bird-tinfo.patch	Thu Feb 17 18:02:23 2011
@@ -0,0 +1,16 @@
+--- bird-1.2.5/configure.in~	2010-08-03 17:44:33.000000000 +0200
++++ bird-1.2.5/configure.in	2011-02-17 17:59:49.058953687 +0100
+@@ -207,9 +207,10 @@
+ if test "$enable_client" = yes ; then
+ 	CLIENT=client
+ 	AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory")
+-	AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses,
+-		AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses,
+-			AC_CHECK_LIB(termcap, tgetent, USE_TERMCAP_LIB=-ltermcap)))
++	AC_CHECK_LIB(tinfow, tgetent, USE_TERMCAP_LIB=-ltinfow,
++		AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses,
++			AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses,
++				AC_CHECK_LIB(termcap, tgetent, USE_TERMCAP_LIB=-ltermcap))))
+ 	AC_CHECK_LIB(readline, rl_callback_read_char, CLIENT_LIBS="-lreadline $CLIENT_LIBS $USE_TERMCAP_LIB",
+ 		AC_MSG_ERROR([[The client requires GNU readline library 2.1 or newer. Either install the library or use --disable-client to compile without the client.]]), $USE_TERMCAP_LIB)
+ 	AC_CHECK_LIB(readline, rl_crlf, AC_DEFINE(HAVE_RL_CRLF),,$USE_TERMCAP_LIB)
================================================================

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