[wicd] Upgrade to wicd-1.7.1b2
David Cantrell
dcantrel at fedoraproject.org
Fri Aug 19 21:34:17 UTC 2011
commit 24496c4d3962db93e979dc4e9a9f63a9335db98c
Author: David Cantrell <dcantrell at redhat.com>
Date: Fri Aug 19 17:11:48 2011 -0400
Upgrade to wicd-1.7.1b2
wicd-1.7.0-deepcopy.patch | 50 --------------------
wicd-1.7.0-initialize-check-and-message.patch | 13 -----
...ailure.patch => wicd-1.7.1b2-dbus-failure.patch | 25 +++++-----
...ages.patch => wicd-1.7.1b2-error-messages.patch | 16 +++---
wicd-1.7.1b2-initialize-check-and-message.patch | 13 +++++
...owing.patch => wicd-1.7.1b2-wired_showing.patch | 8 ++--
wicd.spec | 26 ++++------
7 files changed, 48 insertions(+), 103 deletions(-)
---
diff --git a/wicd-1.7.0-dbus-failure.patch b/wicd-1.7.1b2-dbus-failure.patch
similarity index 59%
rename from wicd-1.7.0-dbus-failure.patch
rename to wicd-1.7.1b2-dbus-failure.patch
index 3d2eacf..5db6f62 100644
--- a/wicd-1.7.0-dbus-failure.patch
+++ b/wicd-1.7.1b2-dbus-failure.patch
@@ -1,6 +1,6 @@
-diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py
---- wicd-1.7.0/cli/wicd-cli.py.orig 2010-01-14 23:49:11.000000000 -0500
-+++ wicd-1.7.0/cli/wicd-cli.py 2011-08-05 11:09:57.561058338 -0400
+diff -up wicd-1.7.1b2/cli/wicd-cli.py.orig wicd-1.7.1b2/cli/wicd-cli.py
+--- wicd-1.7.1b2/cli/wicd-cli.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/cli/wicd-cli.py 2011-08-19 17:06:57.834035455 -0400
@@ -43,6 +43,10 @@ except dbus.DBusException:
print 'Error: Could not connect to the daemon. Please make sure it is running.'
sys.exit(3)
@@ -12,10 +12,10 @@ diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py
parser = optparse.OptionParser()
parser.add_option('--network', '-n', type='int', default=-1)
-diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py
---- wicd-1.7.0/curses/wicd-curses.py.orig 2010-01-14 23:49:11.000000000 -0500
-+++ wicd-1.7.0/curses/wicd-curses.py 2011-08-05 11:09:00.248056606 -0400
-@@ -1016,6 +1016,10 @@ def setup_dbus(force=True):
+diff -up wicd-1.7.1b2/curses/wicd-curses.py.orig wicd-1.7.1b2/curses/wicd-curses.py
+--- wicd-1.7.1b2/curses/wicd-curses.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/curses/wicd-curses.py 2011-08-19 17:06:57.835034617 -0400
+@@ -1017,6 +1017,10 @@ def setup_dbus(force=True):
wireless = dbus_ifaces['wireless']
wired = dbus_ifaces['wired']
@@ -26,10 +26,10 @@ diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py
netentry_curses.dbus_init(dbus_ifaces)
return True
-diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py
---- wicd-1.7.0/gtk/gui.py.orig 2010-01-14 23:49:11.000000000 -0500
-+++ wicd-1.7.0/gtk/gui.py 2011-08-05 10:49:08.392177338 -0400
-@@ -146,6 +146,17 @@ class appGui(object):
+diff -up wicd-1.7.1b2/gtk/gui.py.orig wicd-1.7.1b2/gtk/gui.py
+--- wicd-1.7.1b2/gtk/gui.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/gtk/gui.py 2011-08-19 17:06:57.836054170 -0400
+@@ -145,6 +145,17 @@ class appGui(object):
""" Initializes everything needed for the GUI. """
setup_dbus()
@@ -46,5 +46,4 @@ diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py
+
self.tray = tray
- gladefile = os.path.join(wpath.gtk, "wicd.glade")
-diff -up wicd-1.7.0/gtk/wicd-client.py.orig wicd-1.7.0/gtk/wicd-client.py
+ gladefile = os.path.join(wpath.gtk, "wicd.ui")
diff --git a/wicd-1.7.0-error-messages.patch b/wicd-1.7.1b2-error-messages.patch
similarity index 72%
rename from wicd-1.7.0-error-messages.patch
rename to wicd-1.7.1b2-error-messages.patch
index 1de0cc8..68efe8d 100644
--- a/wicd-1.7.0-error-messages.patch
+++ b/wicd-1.7.1b2-error-messages.patch
@@ -1,8 +1,8 @@
-diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py
---- wicd-1.7.0/curses/wicd-curses.py.orig 2011-08-11 17:01:29.969340068 -0400
-+++ wicd-1.7.0/curses/wicd-curses.py 2011-08-11 17:01:30.159340092 -0400
-@@ -1033,7 +1033,7 @@ if __name__ == '__main__':
- parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()))
+diff -up wicd-1.7.1b2/curses/wicd-curses.py.orig wicd-1.7.1b2/curses/wicd-curses.py
+--- wicd-1.7.1b2/curses/wicd-curses.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/curses/wicd-curses.py 2011-08-19 17:07:55.523159764 -0400
+@@ -1030,7 +1030,7 @@ if __name__ == '__main__':
+ parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REV,daemon.Hello()), prog="wicd-curses")
except Exception, e:
if "DBus.Error.AccessDenied" in e.get_dbus_name():
- print language['access_denied_wc'].replace('$A','\033[1;34m'+wpath.wicd_group+'\033[0m')
@@ -10,9 +10,9 @@ diff -up wicd-1.7.0/curses/wicd-curses.py.orig wicd-1.7.0/curses/wicd-curses.py
sys.exit(1)
else:
raise
-diff -up wicd-1.7.0/wicd/translations.py.orig wicd-1.7.0/wicd/translations.py
---- wicd-1.7.0/wicd/translations.py.orig 2010-01-14 23:49:23.000000000 -0500
-+++ wicd-1.7.0/wicd/translations.py 2011-08-11 17:01:30.179340042 -0400
+diff -up wicd-1.7.1b2/wicd/translations.py.orig wicd-1.7.1b2/wicd/translations.py
+--- wicd-1.7.1b2/wicd/translations.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/wicd/translations.py 2011-08-19 17:07:55.524160039 -0400
@@ -214,9 +214,9 @@ language['connection_established'] = _('
language['disconnected'] = _('''Disconnected''')
language['establishing_connection'] = _('''Establishing connection...''')
diff --git a/wicd-1.7.1b2-initialize-check-and-message.patch b/wicd-1.7.1b2-initialize-check-and-message.patch
new file mode 100644
index 0000000..cdfbd71
--- /dev/null
+++ b/wicd-1.7.1b2-initialize-check-and-message.patch
@@ -0,0 +1,13 @@
+diff -up wicd-1.7.1b2/cli/wicd-cli.py.orig wicd-1.7.1b2/cli/wicd-cli.py
+--- wicd-1.7.1b2/cli/wicd-cli.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/cli/wicd-cli.py 2011-08-19 17:10:38.582160338 -0400
+@@ -191,6 +191,9 @@ if options.connect:
+
+ check = lambda: wired.CheckIfWiredConnecting()
+ message = lambda: wired.CheckWiredConnectingMessage()
++ else:
++ check = lambda: False
++ message = lambda: False
+
+ # update user on what the daemon is doing
+ last = None
diff --git a/wicd-1.7.0-wired_showing.patch b/wicd-1.7.1b2-wired_showing.patch
similarity index 54%
rename from wicd-1.7.0-wired_showing.patch
rename to wicd-1.7.1b2-wired_showing.patch
index 275e4f3..eb8be29 100644
--- a/wicd-1.7.0-wired_showing.patch
+++ b/wicd-1.7.1b2-wired_showing.patch
@@ -1,7 +1,7 @@
-diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py
---- wicd-1.7.0/gtk/gui.py.orig 2011-08-19 14:53:37.667180427 -0400
-+++ wicd-1.7.0/gtk/gui.py 2011-08-19 14:55:43.657056952 -0400
-@@ -220,6 +220,7 @@ class appGui(object):
+diff -up wicd-1.7.1b2/gtk/gui.py.orig wicd-1.7.1b2/gtk/gui.py
+--- wicd-1.7.1b2/gtk/gui.py.orig 2010-10-29 11:36:55.000000000 -0400
++++ wicd-1.7.1b2/gtk/gui.py 2011-08-19 17:09:39.142160320 -0400
+@@ -208,6 +208,7 @@ class appGui(object):
self.refreshing = False
self.prev_state = None
self.update_cb = None
diff --git a/wicd.spec b/wicd.spec
index 78ebc02..601afa5 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -22,12 +22,11 @@ Source2: wicd.service
Source3: org.wicd.daemon.service
Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch
-Patch1: wicd-1.7.0-deepcopy.patch
-Patch2: wicd-1.7.0-dbus-failure.patch
-Patch3: wicd-1.7.0-error-messages.patch
-Patch4: wicd-1.7.0-dbus-policy.patch
-Patch5: wicd-1.7.0-wired_showing.patch
-Patch6: wicd-1.7.0-initialize-check-and-message.patch
+Patch1: wicd-1.7.1b2-dbus-failure.patch
+Patch2: wicd-1.7.1b2-error-messages.patch
+Patch3: wicd-1.7.0-dbus-policy.patch
+Patch4: wicd-1.7.1b2-wired_showing.patch
+Patch5: wicd-1.7.1b2-initialize-check-and-message.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: python2-devel
@@ -88,30 +87,27 @@ Requires: pygtk2-libglade >= 2.10
Client program for wicd that uses a GTK+ interface.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{alphatag}
# Remove the WHEREAREMYFILES and resetting of ~/.wicd/WHEREAREMYFILES
# This is pointless. The documentation can just provide WHEREAREMYFILES,
# which we do in this package.
%patch0 -p1
-# Use cPickle instead of deepcopy in configmanager.py
-%patch1 -p1
-
# Handle D-Bus connection failures a little better
-%patch2 -p1
+%patch1 -p1
# Direct users to D-Bus policy configuration on connection failure
-%patch3 -p1
+%patch2 -p1
# Allow users at the console to control wicd
-%patch4 -p1
+%patch3 -p1
# Initialize appGui._wired_showing in __init__
-%patch5 -p1
+%patch4 -p1
# Make sure check and message are always a lambda
-%patch6 -p1
+%patch5 -p1
%build
# NOTE: --etc is where dhclient.conf.template goes
More information about the scm-commits
mailing list