diff --git a/.cvsignore b/.cvsignore index be92326..25202c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -system-config-network-1.5.99.tar.bz2 +system-config-network-1.6.0.tar.bz2 diff --git a/sources b/sources index aa41126..62ebcc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8cc18cd00ff4099ba502634e866c724 system-config-network-1.5.99.tar.bz2 +8436aadcb1a291120ba98a72bb9cac8a system-config-network-1.6.0.tar.bz2 diff --git a/system-config-network-1.5.99-NoneIPLen.patch b/system-config-network-1.5.99-NoneIPLen.patch deleted file mode 100644 index 07813e3..0000000 --- a/system-config-network-1.5.99-NoneIPLen.patch +++ /dev/null @@ -1,16 +0,0 @@ -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() diff --git a/system-config-network-1.5.99-kudzu.patch b/system-config-network-1.5.99-kudzu.patch deleted file mode 100644 index 0c8b905..0000000 --- a/system-config-network-1.5.99-kudzu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up system-config-network-1.5.99/src/netconfpkg/gui/NCPluginModemInterface.py.kudzu system-config-network-1.5.99/src/netconfpkg/gui/NCPluginModemInterface.py ---- system-config-network-1.5.99/src/netconfpkg/gui/NCPluginModemInterface.py.kudzu 2008-09-16 16:43:23.000000000 +0200 -+++ system-config-network-1.5.99/src/netconfpkg/gui/NCPluginModemInterface.py 2010-01-04 09:26:25.000000000 +0100 -@@ -48,7 +48,7 @@ class ModemInterfaceWizard(InterfaceCrea - if self.xml: - return True - -- if request_rpms(["ppp", "wvdial"]): -+ if request_rpms(["ppp", "wvdial", "kudzu"]): - return False - - glade_file = 'ModemDruid.glade' diff --git a/system-config-network.spec b/system-config-network.spec index 4f8708a..32f7d94 100644 --- a/system-config-network.spec +++ b/system-config-network.spec @@ -1,13 +1,10 @@ # -*- RPM-SPEC -*- Summary: The GUI of the Network Adminstration Tool Name: system-config-network -Version: 1.5.99 -Release: 3%{?dist} +Version: 1.6.0 +Release: 2%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/network Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-network-1.5.99-NoneIPLen.patch -Patch1: system-config-network-1.5.99-kudzu.patch - License: GPLv2+ Group: Applications/System BuildArch: noarch @@ -38,8 +35,6 @@ supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP. %prep %setup -q -%patch0 -p1 -b .NoneIPLen -%patch1 -p1 -b .kudzu %build %configure @@ -108,6 +103,13 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/system-config-network-cmd %changelog +* Tue Mar 16 2010 Jiri Popelka 1.6.0-2 +- translation update +- removed kudzu code and requirements (bz #573868) + +* Fri Jan 15 2010 Harald Hoyer 1.6.0-1 +- version 1.6.0 + * Mon Jan 04 2010 Jiri Popelka 1.5.99-3 - NCPluginDevModem.py still requires kudzu to probe for modems (bz #513939)