rpms/gnome-applet-netspeed/F-12 netspeed_applet-0.15.2-follow-default-route.patch, NONE, 1.1 netspeed_applet-0.15.2-icon-theme-update.patch, NONE, 1.1 netspeed_applet-0.15.2-wireless-quality.patch, NONE, 1.1 gnome-applet-netspeed.spec, 1.19, 1.20

Fri Feb 12 11:22:33 UTC 2010

Author: mschwendt

Update of /cvs/pkgs/rpms/gnome-applet-netspeed/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25704/F-12

Modified Files:
	gnome-applet-netspeed.spec 
Added Files:
	netspeed_applet-0.15.2-follow-default-route.patch 
	netspeed_applet-0.15.2-icon-theme-update.patch 
	netspeed_applet-0.15.2-wireless-quality.patch 
Log Message:
* Fri Feb 12 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.15.2-3.1
- Fix "follow default route" feature (also upstream bz 593346).
- Fix superfluous wireless quality icon updates (upstream bz 580683).
- Fix wireless quality icon calculation crash (upstream bz 567079).
- Remove Obs/Prov for "netspeed_applet". Ancient bloat.
- Remove BR perl(XML::Parser), which is an intltool requirement.
- Remove BR libnotify-devel, which is not needed.


netspeed_applet-0.15.2-follow-default-route.patch:
 backend.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netspeed_applet-0.15.2-follow-default-route.patch ---
diff -Nur netspeed_applet-0.15.2-orig/src/backend.c netspeed_applet-0.15.2/src/backend.c
--- netspeed_applet-0.15.2-orig/src/backend.c	2008-09-07 19:07:26.000000000 +0200
+++ netspeed_applet-0.15.2/src/backend.c	2010-02-12 11:55:08.000000000 +0100
@@ -103,7 +103,7 @@
 		
 		if (retval != 11) continue;
 			
-		if (gw == 0 && !is_dummy_device(device)) {
+		if (ip == 0 && !is_dummy_device(device)) {
 			fclose(fp);
 			return device;
 		}			

netspeed_applet-0.15.2-icon-theme-update.patch:
 netspeed.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE netspeed_applet-0.15.2-icon-theme-update.patch ---
diff -Nur netspeed_applet-0.15.2-orig/src/netspeed.c netspeed_applet-0.15.2/src/netspeed.c
--- netspeed_applet-0.15.2-orig/src/netspeed.c	2008-09-13 21:59:52.000000000 +0200
+++ netspeed_applet-0.15.2/src/netspeed.c	2010-02-12 11:56:30.000000000 +0100
@@ -377,8 +377,10 @@
 static void
 icon_theme_changed_cb(GtkIconTheme *icon_theme, gpointer user_data)
 {
+    NetspeedApplet *applet = (NetspeedApplet*)user_data;
     init_quality_pixbufs(user_data);
-    update_quality_icon(user_data);
+    if (applet->devinfo.type == DEV_WIRELESS && applet->devinfo.up)
+        update_quality_icon(user_data);
     change_icons(user_data);
 }    
 

netspeed_applet-0.15.2-wireless-quality.patch:
 netspeed.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE netspeed_applet-0.15.2-wireless-quality.patch ---
diff -Nur netspeed_applet-0.15.2-orig/src/netspeed.c netspeed_applet-0.15.2/src/netspeed.c
--- netspeed_applet-0.15.2-orig/src/netspeed.c	2008-09-13 21:59:52.000000000 +0200
+++ netspeed_applet-0.15.2/src/netspeed.c	2010-02-12 11:59:10.000000000 +0100
@@ -349,11 +349,10 @@
 update_quality_icon(NetspeedApplet *applet)
 {
 	unsigned int q;
-	
-	q = (applet->devinfo.qual);
-	q = logf (q / 3.0f) + 0.25f;
 
-	g_assert(q >= 0 && q < 4);
+	q = (applet->devinfo.qual);
+	q /= 25;
+	q = CLAMP(q, 0, 3); /* q out of range would crash when accessing qual_pixbufs[q] */
 	gtk_image_set_from_pixbuf (GTK_IMAGE(applet->qual_pix), applet->qual_pixbufs[q]);
 }
 


Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-netspeed/F-12/gnome-applet-netspeed.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gnome-applet-netspeed.spec	25 Jul 2009 00:33:44 -0000	1.19
+++ gnome-applet-netspeed.spec	12 Feb 2010 11:22:32 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -9,10 +9,16 @@ URL:            http://www.gnome.org/pro
 Source0:        http://www.wh-hms.uni-ulm.de/~mfcn/netspeed/packages/netspeed_applet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# GNOME bz 593346
+Patch0: netspeed_applet-0.15.2-follow-default-route.patch
+# GNOME bz 580683
+Patch1: netspeed_applet-0.15.2-icon-theme-update.patch
+# GNOME bz 567079
+Patch2: netspeed_applet-0.15.2-wireless-quality.patch
+
 BuildRequires:  pkgconfig, gettext, scrollkeeper, intltool
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  libgtop2-devel
-BuildRequires:  gnome-panel-devel >= 2.8, libnotify-devel
+BuildRequires:  gnome-panel-devel >= 2.8
 BuildRequires:  gnome-doc-utils
 BuildRequires:  wireless-tools-devel
 
@@ -21,15 +27,16 @@ Requires:       hicolor-icon-theme
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
-Provides:       netspeed_applet = %{version}-%{release}
-Obsoletes:      netspeed_applet <= 0.12.1
-
 %description
 netspeed is a little GNOME applet that shows the traffic on a
 specified network device (for example eth0) in kbytes/s.
 
 %prep
 %setup -q -n netspeed_applet-%{version}
+%patch0 -p1 -b .follow-default-route
+%patch1 -p1 -b .icon-theme-update
+%patch2 -p1 -b .wireless-quality
+
 
 %build
 %configure --disable-scrollkeeper
@@ -41,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang netspeed_applet
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -48,6 +56,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache
 fi
 scrollkeeper-update -q -o %{_datadir}/omf/netspeed_applet || : 
 
+
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
@@ -55,6 +64,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache
 fi
 scrollkeeper-update -q || :
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Fri Feb 12 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.15.2-3.1
+- Fix "follow default route" feature (also upstream bz 593346).
+- Fix superfluous wireless quality icon updates (upstream bz 580683).
+- Fix wireless quality icon calculation crash (upstream bz 567079).
+- Remove Obs/Prov for "netspeed_applet". Ancient bloat.
+- Remove BR perl(XML::Parser), which is an intltool requirement.
+- Remove BR libnotify-devel, which is not needed.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -122,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuild for Fedora Extras 5
 
 * Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-4
--Proper soname rebuild
+- Proper soname rebuild
 
 * Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-3
 - Rebuild for libgtop soname change

