- Fixed xmtr to be installed in /usr/bin instead of /usr/X11R6/bin

(#170945)
This commit is contained in:
Phil Knirsch 2005-10-21 15:05:05 +00:00
parent 08df3e2207
commit 8b13adb88d
2 changed files with 8 additions and 5 deletions

View File

@ -1,7 +1,7 @@
Summary: A network diagnostic tool. Summary: A network diagnostic tool.
Name: mtr Name: mtr
Version: 0.69 Version: 0.69
Release: 6 Release: 7
Epoch: 2 Epoch: 2
Group: Applications/Internet Group: Applications/Internet
License: GPL License: GPL
@ -51,12 +51,12 @@ make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT 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 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 0755 mtr $RPM_BUILD_ROOT%{_sbindir}/mtr install -m 0755 mtr $RPM_BUILD_ROOT%{_sbindir}/mtr
make DESTDIR=$RPM_BUILD_ROOT install 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 install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/xmtr install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/xmtr
@ -91,13 +91,16 @@ rm -rf $RPM_BUILD_ROOT
%files gtk %files gtk
%defattr(-,root,root) %defattr(-,root,root)
%config(missingok) %{_datadir}/applications/net-xmtr.desktop %config(missingok) %{_datadir}/applications/net-xmtr.desktop
%attr(0755,root,root) /usr/X11R6/bin/xmtr %attr(0755,root,root) %{_bindir}/xmtr
%{_bindir}/xmtr %{_bindir}/xmtr
%{_sysconfdir}/pam.d/* %{_sysconfdir}/pam.d/*
%{_sysconfdir}/security/console.apps/* %{_sysconfdir}/security/console.apps/*
%{_datadir}/pixmaps/mtr_icon.xpm %{_datadir}/pixmaps/mtr_icon.xpm
%changelog %changelog
* Fri Oct 21 2005 Phil Knirsch <pknirsch@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@redhat.com> 2:0.69-6 * Mon Oct 10 2005 Phil Knirsch <pknirsch@redhat.com> 2:0.69-6
- Added missing gtk+-devel BuildPreReq (#168215) - Added missing gtk+-devel BuildPreReq (#168215)

View File

@ -1,3 +1,3 @@
USER=root USER=root
PROGRAM=/usr/X11R6/bin/xmtr PROGRAM=/usr/bin/xmtr.bin
SESSION=true SESSION=true