[system-config-network] version 1.6.7

Mon Dec 17 15:08:38 UTC 2012

commit 1b25ec6b7b0a226d95338c5a3f5f34daf0186509
Author: Nils Philippsen <nils at redhat.com>
Date:   Mon Dec 17 16:07:38 2012 +0100

    version 1.6.7

 .gitignore                 |    1 +
 sources                    |    2 +-
 system-config-network.spec |   39 +++++++++++++++++++++------------------
 3 files changed, 23 insertions(+), 19 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2257341..92ec511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /system-config-network-1.6.2.tar.bz2
 /system-config-network-1.6.3.tar.bz2
 /system-config-network-1.6.6.tar.bz2
+/system-config-network-1.6.7.tar.bz2
diff --git a/sources b/sources
index 61d12dd..a24c748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf189f8bca4454d21612a19b9364cf31  system-config-network-1.6.6.tar.bz2
+f7e902f213d86daf10713776a94a0e39  system-config-network-1.6.7.tar.bz2
diff --git a/system-config-network.spec b/system-config-network.spec
index 3d65d50..a08794e 100644
--- a/system-config-network.spec
+++ b/system-config-network.spec
@@ -7,12 +7,12 @@
 # -*- RPM-SPEC -*-
 Summary: Network Administration Tool
 Name: system-config-network
-Version: 1.6.6
+Version: 1.6.7
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
-Group: Applications/System 
+Group: Applications/System
 BuildArch: noarch
 BuildRequires: python
 BuildRequires: openjade
@@ -32,6 +32,9 @@ Requires: usermode-gtk
 Requires: xdg-utils
 Requires: gnome-python2-gnome
 Requires: gnome-python2-bonobo
+%else
+Obsoletes: %{name}-tui < %{version}-%{release}
+Provides: %{name}-tui = %{version}-%{release}
 %endif
 
 %description
@@ -44,7 +47,7 @@ Summary: The Network Administration Tool
 Group: Applications/System
 %endif
 Requires: initscripts
-Requires: usermode 
+Requires: usermode
 Requires: rpm-python
 Requires: newt-python
 Requires: pciutils
@@ -104,7 +107,7 @@ done
 # package.
 %files %{!?with_gui:-f %{name}.lang}
 %if %{with gui}
-%doc COPYING 
+%doc COPYING
 %{_datadir}/system-config-network/help
 %{_datadir}/system-config-network/pixmaps
 %{_datadir}/system-config-network/netconfpkg/gui
@@ -231,16 +234,16 @@ done
 - Improved compatibility with NetworkManager
 - Resolves: #472154, #475155, #473919, #474988, #470203
 
-* Tue Dec 02 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.5.94-1 
+* Tue Dec 02 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.5.94-1
 - version 1.5.94
 - fixed tcp/ip gateway/netmask problem
 - fixed crash when pap-secrets contains spaces
 - Resolves: #469434, #465748
 
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.5.93-3 
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.5.93-3
 - Rebuild for Python 2.6
 
-* Tue Oct 28 2008 Harald Hoyer <harald at redhat.com> 1.5.93-2 
+* Tue Oct 28 2008 Harald Hoyer <harald at redhat.com> 1.5.93-2
 - version 1.5.93
 
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com>
@@ -372,7 +375,7 @@ done
 - added tui subdir (bug #202560)
 
 * Fri Aug 11 2006 Harald Hoyer <harald at redhat.com> - 1.3.92
-- fixed #201659 
+- fixed #201659
 - translation update
 
 * Tue Jul 25 2006 Harald Hoyer <harald at redhat.com> - 1.3.91
@@ -382,7 +385,7 @@ done
 - fixed:
 - [135014] MTU and MRU should be confiurable for ADSL
 - [141055] system-config-network needs to be able to set MTU
-- [149780] no GATEWAY, IPADDR and NETMASK, if BOOTPROTO=dhcp 
+- [149780] no GATEWAY, IPADDR and NETMASK, if BOOTPROTO=dhcp
 - [150362] [Errno 2] No such file or directory: '/etc/hosts'
 - [157172] Wrong DNS for provider "ZEDAT_Berlin"
 - [160417] Bad: cannot make any changes to network settings
@@ -391,9 +394,9 @@ done
 - [176145] Please enable Serbian translation in system-config-network
 - [177198] deprecation warning in system-config-network
 - [187563] localized option passed to ifcfg-wlan0 files
-- [188321] Creating an alias for a network interface breaks device 
+- [188321] Creating an alias for a network interface breaks device
            setup after reboots
-- [190242] Firefox instance running as root when used to read docs 
+- [190242] Firefox instance running as root when used to read docs
            for system-config-*
 - [197401] Don't write HWADDR for alias interfaces
 
@@ -452,7 +455,7 @@ done
 * Fri Jul 30 2004 Harald Hoyer <harald at redhat.com> - 1.3.18
 - changed mainloop and mainquit
 - translation updates
- 
+
 * Tue Jul 06 2004 Harald Hoyer <harald at redhat.com> - 1.3.17
 - bugfix release for FC2
 
@@ -466,7 +469,7 @@ done
 - switched logging to syslog
 - do not touch bonding slaves
 - better alias handling
-- better handling of chroot 
+- better handling of chroot
 - read *.ko modules also
 - handle modules parameter without "="
 - create correct SPI_ identifier for manual IPsec keying
@@ -552,7 +555,7 @@ done
 * Wed Oct 22 2003 Than Ngo <than at redhat.com> 1.3.7-2
 - fix a bug in saving of ISDN config file
 - add support nickname for ISDN
-  
+
 * Wed Oct  8 2003 Harald Hoyer <harald at redhat.de> 1.3.7
 - merged in changes from Taroon
 
@@ -743,7 +746,7 @@ done
 * Wed May 29 2002 Harald Hoyer <harald at redhat.de>
 - ported to python2, gtk2, gnome2
 
-* Wed Apr 17 2002 Trond Eivind Glomsrød <teg at redhat.com> 
+* Wed Apr 17 2002 Trond Eivind Glomsrød <teg at redhat.com>
 - Turn off wireless. It doesn't work with all modes, all cards
  and you can't edit IP settings after the initial attempt
 
@@ -771,7 +774,7 @@ done
 - More fixes (#63177,#57064,#63207)
 
 * Tue Apr 09 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.9.23-1
-- more fixes 
+- more fixes
 - updated translations
 
 * Thu Apr 04 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.9.22-1
@@ -926,7 +929,7 @@ done
 
 * Mon Aug 20 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.7.4-1
 - More bugfixes, among them #51929, #51991, #51721, #51722,
-  partial #52044, #51720. 
+  partial #52044, #51720.
 - Updated translations, include more languages
 
 * Thu Aug 16 2001 Phil Knirsch <phil at redhat.de> 0.7.3-2
@@ -1050,7 +1053,7 @@ done
 
 * Mon Jul  9 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - 0.2
-- New name - system-config-network. 
+- New name - system-config-network.
   Shortcut: neat (NEtwork Administration Tool)
 
 * Fri Jul 06 2001 Trond Eivind Glomsrød <teg at redhat.com>
