packages: mtr/mtr-usage_first_max_hop.patch, mtr/mtr.spec, mtr/mtr-tinfo.pa...

[baggins]

Author: baggins                      Date: Mon Jun  7 16:38:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.78
- fix linking with ncurses/tinfo ('raw' symbol is in tinfo)

---- Files affected:
packages/mtr:
   mtr-usage_first_max_hop.patch (1.1 -> 1.2) , mtr.spec (1.99 -> 1.100) , mtr-tinfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mtr/mtr-usage_first_max_hop.patch
diff -u packages/mtr/mtr-usage_first_max_hop.patch:1.1 packages/mtr/mtr-usage_first_max_hop.patch:1.2
--- packages/mtr/mtr-usage_first_max_hop.patch:1.1	Sat Jan  5 15:13:22 2008
+++ packages/mtr/mtr-usage_first_max_hop.patch	Mon Jun  7 18:38:18 2010
@@ -1,9 +1,9 @@
 --- mtr.c~	2008-01-05 14:51:56.000000000 +0100
 +++ mtr.c	2008-01-05 14:57:54.940603328 +0100
 @@ -367,6 +367,7 @@
- 	   "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n"
             "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */
             "\t\t[--psize=bytes/-s bytes]\n"            /* ok */
+            "\t\t[--report-wide|-w] [-u]\n"            /* rew */
 +           "\t\t[-f FIRSTHOP] [-m MAXHOP]\n"            /* first and max hop */
  	   "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]);
      exit(0);

================================================================
Index: packages/mtr/mtr.spec
diff -u packages/mtr/mtr.spec:1.99 packages/mtr/mtr.spec:1.100
--- packages/mtr/mtr.spec:1.99	Wed Oct 29 14:36:12 2008
+++ packages/mtr/mtr.spec	Mon Jun  7 18:38:18 2010
@@ -10,13 +10,13 @@
 Summary(ru.UTF-8):	Matt's Traceroute - утилита для диагностики сети
 Summary(uk.UTF-8):	Matt's Traceroute - утиліта для діагностики мережі
 Name:		mtr
-Version:	0.75
+Version:	0.78
 Release:	1
 Epoch:		1
 License:	GPL
 Group:		Networking/Utilities
 Source0:	ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
-# Source0-md5:	23baca52d0922c2ecba7eba05317868c
+# Source0-md5:	db94fa4929007c0389fefba945b850c7
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-Makefile.patch
@@ -25,10 +25,11 @@
 Patch3:		%{name}-display.patch
 Patch4:		%{name}-usage_first_max_hop.patch
 Patch5:		%{name}-noraw.patch
+Patch6:		%{name}-tinfo.patch
 URL:		http://www.bitwizard.nl/mtr/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_x:BuildRequires:	gtk+2-devel >= 2:2.4.0}
+%{?with_x:BuildRequires:	gtk+2-devel >= 2:2.6.0}
 BuildRequires:	ncurses-devel >= 5.2
 %{?with_x:BuildRequires:	pkgconfig}
 Obsoletes:	mtr-ncurses
@@ -140,6 +141,7 @@
 %patch3 -p1
 %patch4 -p0
 %patch5 -p1
+%patch6 -p1
 
 echo 'AC_DEFUN([AM_PATH_GTK],[$3])' >> acinclude.m4
 %{!?with_x:echo 'AC_DEFUN([AM_PATH_GTK_2_0],[$3])' >> acinclude.m4}
@@ -153,7 +155,6 @@
 %if %{with x}
 %configure \
 	--with-gtk \
-	--enable-gtk2 \
 	--enable-ipv6
 
 %{__make}
@@ -212,6 +213,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2010/06/07 16:38:18  baggins
+- updated to 0.78
+- fix linking with ncurses/tinfo ('raw' symbol is in tinfo)
+
 Revision 1.99  2008/10/29 13:36:12  paszczus
 - updated to 0.75
 

================================================================
Index: packages/mtr/mtr-tinfo.patch
diff -u /dev/null packages/mtr/mtr-tinfo.patch:1.1
--- /dev/null	Mon Jun  7 18:38:24 2010
+++ packages/mtr/mtr-tinfo.patch	Mon Jun  7 18:38:18 2010
@@ -0,0 +1,13 @@
+--- mtr-0.78/configure.in~	2010-06-07 18:26:11.220302104 +0200
++++ mtr-0.78/configure.in	2010-06-07 18:28:29.062301450 +0200
+@@ -35,6 +35,10 @@
+ 	AC_DEFINE(NO_CURSES, 1, Define if you don't have the curses libraries available.)
+ 	CURSES_OBJ=))))
+ 
++if test "x$CURSES_OBJ" != "x"; then
++	LIBS="$LIBS -ltinfo"
++fi
++
+ AC_CHECK_FUNCS(attron fcntl)
+ 
+ AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mtr/mtr-usage_first_max_hop.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mtr/mtr.spec?r1=1.99&r2=1.100&f=u