rpms/mytop/F-11 mytop-1.7-undef-resolv.patch, NONE, 1.1 mytop.spec, 1.3, 1.4

[terjeros]

Author: terjeros

Update of /cvs/pkgs/rpms/mytop/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4609/F-11

Modified Files:
	mytop.spec 
Added Files:
	mytop-1.7-undef-resolv.patch 
Log Message:
Sync with rawhide.



mytop-1.7-undef-resolv.patch:
 mytop |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE mytop-1.7-undef-resolv.patch ---
--- mytop-1.7/mytop.orig	2009-03-21 16:31:23.000000000 +0100
+++ mytop-1.7/mytop	2010-05-09 15:10:33.000000000 +0200
@@ -955,8 +955,11 @@
         {
             $thread->{Host} =~ s/:\d+$//;
             my $host = gethostbyaddr(inet_aton($thread->{Host}), AF_INET);
-            $host =~ s/^([^.]+).*/$1/;
-            $thread->{Host} = $host;
+            if (defined $host)
+            {
+                $host =~ s/^([^.]+).*/$1/;
+                $thread->{Host} = $host;
+            }
         }
 
         ## Fix possible undefs


Index: mytop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mytop/F-11/mytop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mytop.spec	27 Mar 2010 21:00:59 -0000	1.3
+++ mytop.spec	9 May 2010 13:28:44 -0000	1.4
@@ -2,7 +2,7 @@
 Summary:        A top clone for MySQL
 Name:           mytop
 Version:        1.7
-Release:        1.%{git}%{?dist}
+Release:        3.%{git}%{?dist}
 Group:          Applications/System
 License:        GPLv2
 URL:            http://jeremy.zawodny.com/mysql/mytop
@@ -11,6 +11,8 @@ URL:            http://jeremy.zawodny.co
 # $ cd mytop
 # $ git archive --format=tar --prefix=mytop-1.7/ %{git} | xz > mytop-1.7-%{git}.tar.xz
 Source0:        mytop-%{version}-%{git}.tar.xz
+Patch01:        mytop-1.7-long.patch
+Patch02:        mytop-1.7-undef-resolv.patch
 Requires:       perl(DBD::mysql) >= 1
 Requires:       perl(Term::ReadKey) >= 2.1
 Requires:       perl(Term::ANSIColor) perl(Time::HiRes)
@@ -28,6 +30,8 @@ familiar top application.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__perl} Makefile.PL
@@ -51,17 +55,23 @@ familiar top application.
 %{_bindir}/%{name}
 
 %changelog
+* Sun May 09 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.7-3.b737f60
+- add patch to fix #589366
+
+* Mon May 03 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.7-2.b737f60
+- add patch to fix #584602
+
 * Sat Mar 27 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.7-1.b737f60
-- 1.7 (from github), fixing bz #577528.
+- 1.7 (from github), fixing bz #577528
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Dec 30 2007 Terje Rosten <terje.rosten at ntnu.no> - 1.6-2
-- remove explicit req on dbi, let rpm to the job.
+- remove explicit req on dbi, let rpm to the job
 
 * Wed Dec 26 2007 Terje Rosten <terje.rosten at ntnu.no> - 1.6-1
-- Initial package
+- initial package