rpms/system-config-network/F-12 system-config-network-1.5.99-NoneIPLen.patch, NONE, 1.1 system-config-network.spec, 1.51, 1.52

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-network/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9295

Modified Files:
	system-config-network.spec 
Added Files:
	system-config-network-1.5.99-NoneIPLen.patch 
Log Message:
* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com>  1.5.99-2
- Fixed s-control-network crash when adding new modem (bz #544412)


system-config-network-1.5.99-NoneIPLen.patch:
 NCDevice.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-network-1.5.99-NoneIPLen.patch ---
diff -up system-config-network-1.5.99/src/netconfpkg/NCDevice.py.NoneIPLen system-config-network-1.5.99/src/netconfpkg/NCDevice.py
--- system-config-network-1.5.99/src/netconfpkg/NCDevice.py.NoneIPLen	2009-08-12 16:28:33.000000000 +0200
+++ system-config-network-1.5.99/src/netconfpkg/NCDevice.py	2009-12-07 11:05:08.000000000 +0100
@@ -390,10 +390,10 @@ class Device(Device_base):
         conf.fsf()
 
         if self.BootProto == None:
-            if len(self.IP):
+            if self.IP:
                 self.BootProto = "none"
             else:
-                self.BootProto = 'dhcp'                
+                self.BootProto = 'dhcp'
 
         if self.BootProto:
             self.BootProto = self.BootProto.lower()


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/F-12/system-config-network.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- system-config-network.spec	14 Sep 2009 12:34:10 -0000	1.51
+++ system-config-network.spec	7 Dec 2009 10:21:29 -0000	1.52
@@ -2,9 +2,11 @@
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
 Version: 1.5.99
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-network-1.5.99-NoneIPLen.patch
+
 License: GPLv2+
 Group: Applications/System 
 BuildArch: noarch
@@ -35,6 +37,7 @@ supporting Ethernet, Wireless, TokenRing
 
 %prep
 %setup -q
+%patch0 -p1 -b .NoneIPLen
 
 %build
 %configure
@@ -103,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Mon Dec 07 2009 Jiri Popelka <jpopelka at redhat.com>  1.5.99-2
+- Fixed s-control-network crash when adding new modem (bz #544412)
+
 * Mon Sep 14 2009 Harald Hoyer <harald at redhat.com> 1.5.99-1
 - version 1.5.99
 - removed all rhpl requirements