[packages/mtr] - updated to 0.83 - added nox patch (fix non-gtk version build, which now requires glib)

[qboosh]

commit e53850831cac639d17714a5099d74c8cd1133864
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Feb 14 20:52:59 2013 +0100

    - updated to 0.83
    - added nox patch (fix non-gtk version build, which now requires glib)

 mtr-nox.patch | 11 +++++++++++
 mtr.spec      | 17 +++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/mtr.spec b/mtr.spec
index f6d8b1b..f1b05f5 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -9,13 +9,13 @@ Summary(pt_BR.UTF-8):	Ferramenta para diagnóstico da rede, combinando ping/trac
 Summary(ru.UTF-8):	Matt's Traceroute - утилита для диагностики сети
 Summary(uk.UTF-8):	Matt's Traceroute - утиліта для діагностики мережі
 Name:		mtr
-Version:	0.82
-Release:	2
+Version:	0.83
+Release:	1
 Epoch:		1
-License:	GPL
+License:	GPL v2
 Group:		Networking/Utilities
 Source0:	ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
-# Source0-md5:	10601ea543fda3e51545c4bce195b64c
+# Source0-md5:	2e3a40f2da47748ad0053a5d678b9b4a
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-Makefile.patch
@@ -24,13 +24,16 @@ Patch2:		%{name}-mtr6.patch
 Patch3:		%{name}-display.patch
 Patch4:		%{name}-usage_first_max_hop.patch
 Patch5:		%{name}-noraw.patch
+Patch6:		%{name}-nox.patch
 URL:		http://www.bitwizard.nl/mtr/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	glib2-devel >= 1:2.6.0
 %{?with_x:BuildRequires:	gtk+2-devel >= 2:2.6.0}
 BuildRequires:	ncurses-devel >= 5.2
 %{?with_x:BuildRequires:	pkgconfig}
 Obsoletes:	mtr-ncurses
+Requires:	glib2 >= 1:2.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -85,6 +88,7 @@ Summary(pt_BR.UTF-8):	Interface GTK+ para o mtr
 Summary(ru.UTF-8):	Matt's Traceroute - утилита для диагностики сети
 Summary(uk.UTF-8):	Matt's Traceroute - утиліта для діагностики мережі
 Group:		Networking/Utilities
+%{?with_x:Requires:	gtk+2 >= 2:2.6.0}
 Obsoletes:	mtr-gtk
 
 %description X11
@@ -139,8 +143,9 @@ mtr - це traceroute та ping в одному флаконі. При запу
 %patch3 -p1
 %patch4 -p0
 %patch5 -p1
+%patch6 -p1
 
-echo 'AC_DEFUN([AM_PATH_GTK],[$3])' >> acinclude.m4
+#echo 'AC_DEFUN([AM_PATH_GTK],[$3])' >> acinclude.m4
 %{!?with_x:echo 'AC_DEFUN([AM_PATH_GTK_2_0],[$3])' >> acinclude.m4}
 
 %build
@@ -193,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(4755,root,root) %{_bindir}/mtr
 %attr(4755,root,root) %{_bindir}/mtr6
 %{_sbindir}/mtr
-%{_mandir}/man8/*
+%{_mandir}/man8/mtr.8*
 
 %if %{with x}
 %files X11
diff --git a/mtr-nox.patch b/mtr-nox.patch
new file mode 100644
index 0000000..3b40509
--- /dev/null
+++ b/mtr-nox.patch
@@ -0,0 +1,11 @@
+--- mtr-0.83/configure.in.orig	2013-02-14 19:47:42.428664302 +0100
++++ mtr-0.83/configure.in	2013-02-14 20:45:17.061852659 +0100
+@@ -55,6 +55,8 @@
+                    AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
+                            GTK_OBJ="")
+ else
++	AM_PATH_GLIB_2_0(2.6.0, [CFLAGS="$CFLAGS $GLIB_CFLAGS"
++			   LIBS="$LIBS $GLIB_LIBS -lm"])
+ 	AC_DEFINE(NO_GTK)
+ 	GTK_OBJ=""
+ fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mtr.git/commitdiff/e53850831cac639d17714a5099d74c8cd1133864