clean up CVS, update spec for merge review.

.cvsignore

@@ -1 +1 @@
-mtr-0.71.tar.gz
+mtr-0.72.tar.gz

mtr.spec

@@ -1,7 +1,7 @@
-Summary: A network diagnostic tool.
+Summary: A network diagnostic tool
 Name: mtr
-Version: 0.71
+Version: 0.72
-Release: 3.1
+Release: 1
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -9,13 +9,13 @@ URL: http://www.BitWizard.nl/mtr
 Source:	ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
 Source1: xmtr.consolehelper
 Source2: xmtr.pam
+Source3: net-x%{name}.desktop
 Patch1:	mtr-0.69-CVE-2002-0497.patch
 Patch2:	mtr-0.69-format.patch
 Patch3: mtr-0.71-underflow.patch
-Patch4: mtr-0.71-ipv6-resolvehostname.patch 
+BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
-BuildRequires: ncurses-devel gtk2-devel
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Mtr is a network diagnostic tool that combines ping and traceroute
@@ -24,7 +24,7 @@ useful for using Mtr from a telnet session; and a GTK+ interface for X
 (provided in the mtr-gtk package).
 
 %package gtk
-Summary: The GTK+ interface for mtr.
+Summary: The GTK+ interface for mtr
 Group: Applications/Internet
 Requires: mtr = %{epoch}:%{version}-%{release}
 Requires: usermode >= 1.37
@@ -38,7 +38,6 @@ diagnostic tool.
 %patch1 -p1 -b .CVE-2002-0497
 %patch2 -p1 -b .format
 %patch3 -p1 -b .underflow
-%patch4 -p1 -b .resolvehostname
 
 %build
 %configure --enable-gtk2
@@ -48,9 +47,11 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,share/pixmaps}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 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
 
 install -m 0755 xmtr $RPM_BUILD_ROOT/%{_bindir}/xmtr.bin
@@ -63,38 +64,34 @@ mkdir -p  $RPM_BUILD_ROOT/%{_bindir}
 ln -fs consolehelper $RPM_BUILD_ROOT/%{_bindir}/xmtr
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-cat > $RPM_BUILD_ROOT/%{_datadir}/applications/net-xmtr.desktop <<EOF
+
-[Desktop Entry]
+desktop-file-install --vendor="fedora"				\
-Name=Traceroute
+	--dir=${RPM_BUILD_ROOT}/%{_datadir}/applications		\
-Type=Application
+	%{SOURCE3}
-Comment=Traces packets between two network hosts
-Exec=xmtr
-Terminal=false
-Icon=mtr_icon.xpm
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.2
-Categories=X-Red-Hat-Base;System;Application;
-EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING FORMATS NEWS README SECURITY
 %attr(0755,root,root) %{_sbindir}/mtr
-%{_mandir}/*/*
+%{_mandir}/man8/*
 
 %files gtk
-%defattr(-,root,root)
+%defattr(-,root,root,-)
-%config(missingok) %{_datadir}/applications/net-xmtr.desktop
+%{_datadir}/applications/fedora-net-x%{name}.desktop
 %attr(0755,root,root) %{_bindir}/xmtr.bin
 %{_bindir}/xmtr
-%{_sysconfdir}/pam.d/*
+%config(noreplace) %{_sysconfdir}/pam.d/*
-%{_sysconfdir}/security/console.apps/*
+%config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Thu Feb 22 2007 Marcela Maslanova <mmaslano@redhat.com> - 2:0.72-1
+- review
+- rhbz#226164
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2:0.71-3.1
 - rebuild
 

sources

@@ -1 +1 @@
-8c1c9f5db2c599eea3b12bfed8b80618  mtr-0.71.tar.gz
+d771061f8da96b80ecca2f69a3a2d594  mtr-0.72.tar.gz