From 2e55c55600935601592e613ad702df15a5ad6879 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 08:51:56 +0000
Subject: [PATCH] auto-import changelog data from mtr-0.49-7.src.rpm Mon Aug 19
 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-7 - Fixed consolehelper support.

---
 mtr.spec | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mtr.spec b/mtr.spec
index 1cb80ea..273a643 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.49
-Release: 6
+Release: 7
 Serial:	2
 Group: Applications/Internet
 License: GPL
@@ -24,7 +24,7 @@ useful for using Mtr from a telnet session; and a GTK+ interface for X
 Summary: The GTK+ interface for mtr.
 Serial:	%{serial}
 Group: Applications/Internet
-Requires: mtr
+Requires: mtr, usermode >= 1.37
 
 %description gtk
 The mtr-gtk package provides the GTK+ interface for the mtr network
@@ -49,7 +49,7 @@ make && mv mtr xmtr && make distclean
 make
 
 %install
-if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
+if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 mkdir -p $RPM_BUILD_ROOT/usr/{X11R6/bin,bin,sbin,share/pixmaps}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -60,8 +60,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/xmtr
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xmtr
-
-ln -s ../sbin/mtr $RPM_BUILD_ROOT/usr/bin/mtr
+mkdir -p  $RPM_BUILD_ROOT/%{_bindir}
+ln -fs consolehelper $RPM_BUILD_ROOT/%{_bindir}/xmtr
 
 mkdir -p %{buildroot}/%{_datadir}/applications
 cat > %{buildroot}/%{_datadir}/applications/net-xmtr.desktop <<EOF
@@ -78,7 +78,7 @@ Categories=X-Red-Hat-Base;System;Application;
 EOF
 
 %clean
-if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
+if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 
 %files
 %defattr(-,root,root)
@@ -91,15 +91,19 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
 %doc AUTHORS COPYING FORMATS INSTALL NEWS README SECURITY TODO
 %config(missingok) %{_datadir}/applications/net-xmtr.desktop
 %attr(0755,root,root) /usr/X11R6/bin/xmtr
+%{_bindir}/xmtr
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/security/console.apps/*
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Mon Aug 19 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-7
+- Fixed consolehelper support.
+
 * Wed Aug 07 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-6
 - Desktop file fixes (#69550).
 
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.49-5
 - automated rebuild
 
 * Tue Jun 18 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-4