rpms/mtr/devel mtr.spec,1.27,1.28 xmtr.consolehelper,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/mtr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2576

Modified Files:
	mtr.spec xmtr.consolehelper 
Log Message:
- Fixed xmtr to be installed in /usr/bin instead of /usr/X11R6/bin (#170945)



Index: mtr.spec
===================================================================
RCS file: /cvs/dist/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mtr.spec	10 Oct 2005 14:20:17 -0000	1.27
+++ mtr.spec	21 Oct 2005 15:05:05 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.69
-Release: 6
+Release: 7
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -51,12 +51,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{X11R6/bin,bin,sbin,share/pixmaps}
+mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,share/pixmaps}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 0755 mtr $RPM_BUILD_ROOT%{_sbindir}/mtr
 make DESTDIR=$RPM_BUILD_ROOT install
 
-install -m 0755 xmtr $RPM_BUILD_ROOT/usr/X11R6/bin
+install -m 0755 xmtr $RPM_BUILD_ROOT/%{_bindir}/xmtr.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
@@ -91,13 +91,16 @@
 %files gtk
 %defattr(-,root,root)
 %config(missingok) %{_datadir}/applications/net-xmtr.desktop
-%attr(0755,root,root) /usr/X11R6/bin/xmtr
+%attr(0755,root,root) %{_bindir}/xmtr
 %{_bindir}/xmtr
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/security/console.apps/*
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Fri Oct 21 2005 Phil Knirsch <pknirsch at redhat.com> 2:0.69-7
+- Fixed xmtr to be installed in /usr/bin instead of /usr/X11R6/bin (#170945)
+
 * Mon Oct 10 2005 Phil Knirsch <pknirsch at redhat.com> 2:0.69-6
 - Added missing gtk+-devel BuildPreReq (#168215)
 


Index: xmtr.consolehelper
===================================================================
RCS file: /cvs/dist/rpms/mtr/devel/xmtr.consolehelper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmtr.consolehelper	9 Sep 2004 08:51:18 -0000	1.1
+++ xmtr.consolehelper	21 Oct 2005 15:05:05 -0000	1.2
@@ -1,3 +1,3 @@
 USER=root
-PROGRAM=/usr/X11R6/bin/xmtr
+PROGRAM=/usr/bin/xmtr.bin
 SESSION=true