From 709e33c917e042d2ffb03990b629ca723aaa8cd9 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 08:51:18 +0000
Subject: [PATCH] auto-import changelog data from mtr-0.49-6.src.rpm 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> - automated rebuild Tue Jun 18
 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-4 - Added consolehelper support
 to xmtr. Sun May 26 2002 Tim Powers <timp@redhat.com> - automated rebuild Wed
 May 22 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-2 - Fixed autoFOO
 problems.

---
 mtr.spec           | 44 ++++++++++++++++++++++++++++++++++++--------
 xmtr.consolehelper |  3 +++
 xmtr.pam           |  6 ++++++
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 xmtr.consolehelper
 create mode 100644 xmtr.pam

diff --git a/mtr.spec b/mtr.spec
index 6be3a2c..1cb80ea 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -1,12 +1,14 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.49
-Release: 1
-Serial:	1
+Release: 6
+Serial:	2
 Group: Applications/Internet
 License: GPL
 URL: http://www.BitWizard.nl/mtr
 Source:	ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
+Source1: xmtr.consolehelper
+Source2: xmtr.pam
 Patch0:	%{name}-0.41-dest.patch
 Patch1: %{name}-0.44-nogtk.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -32,6 +34,8 @@ diagnostic tool.
 %setup -q
 %patch0 -p1 -b .dest
 #%patch1 -p1 -b .nogtk
+aclocal
+automake -a
 autoconf
 
 %configure
@@ -40,7 +44,7 @@ autoconf
 make && mv mtr xmtr && make distclean
 
 # mmm, broken configure script
-export GTK_CONFIG=/dev/null 
+ export GTK_CONFIG=/dev/null 
 %configure
 make
 
@@ -52,18 +56,25 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 install -m 4755 xmtr $RPM_BUILD_ROOT/usr/X11R6/bin
 install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
+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 %{buildroot}/etc/X11/applnk/Internet
-cat > %{buildroot}/etc/X11/applnk/Internet/xmtr.desktop <<EOF
+mkdir -p %{buildroot}/%{_datadir}/applications
+cat > %{buildroot}/%{_datadir}/applications/net-xmtr.desktop <<EOF
 [Desktop Entry]
 Name=Traceroute
 Type=Application
-Comment=%{summary}
+Comment=Traces packets between two network hosts
 Exec=xmtr
 Terminal=false
 Icon=/usr/share/pixmaps/mtr_icon.xpm
+Encoding=UTF-8
+X-Desktop-File-Install-Version=0.2
+Categories=X-Red-Hat-Base;System;Application;
 EOF
 
 %clean
@@ -78,11 +89,28 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
 %files gtk
 %defattr(-,root,root)
 %doc AUTHORS COPYING FORMATS INSTALL NEWS README SECURITY TODO
-%config(missingok) /etc/X11/applnk/Internet/xmtr.desktop
+%config(missingok) %{_datadir}/applications/net-xmtr.desktop
 %attr(0755,root,root) /usr/X11R6/bin/xmtr
-/usr/share/pixmaps/mtr_icon.xpm
+%{_sysconfdir}/pam.d/*
+%{_sysconfdir}/security/console.apps/*
+%{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* 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>
+- automated rebuild
+
+* Tue Jun 18 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-4
+- Added consolehelper support to xmtr.
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed May 22 2002 Phil Knirsch <pknirsch@redhat.com> 0.49-2
+- Fixed autoFOO problems.
+
 * Fri Mar 08 2002 Florian La Roche <Florian.LaRoche@redhat.de>
 - 0.49 update
 
diff --git a/xmtr.consolehelper b/xmtr.consolehelper
new file mode 100644
index 0000000..1005a64
--- /dev/null
+++ b/xmtr.consolehelper
@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/usr/X11R6/bin/xmtr
+SESSION=true
diff --git a/xmtr.pam b/xmtr.pam
new file mode 100644
index 0000000..ee24553
--- /dev/null
+++ b/xmtr.pam
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       sufficient	/lib/security/pam_rootok.so
+auth       required	/lib/security/pam_stack.so service=system-auth
+session	   required	/lib/security/pam_permit.so
+session    optional	/lib/security/pam_xauth.so
+account    required	/lib/security/pam_permit.so