Upgrade to wicd-1.7.3 (#1190304)

.gitignore

@@ -1 +1 @@
-wicd-1.7.2.4.tar.gz
+wicd-1.7.3.tar.gz

770_769.diff

@@ -1,16 +0,0 @@
-=== modified file 'wicd/misc.py'
---- wicd/misc.py	2012-04-30 19:20:47 +0000
-+++ wicd/misc.py	2012-05-03 16:01:49 +0000
-@@ -430,7 +430,10 @@
-     """ Sanitize property names to be used in config-files. """
-     allowed = string.ascii_letters + '_' + string.digits
-     table = string.maketrans(allowed, ' ' * len(allowed))
--    return s.translate(None, table)
-+
-+    # s is a dbus.String -- since we don't allow unicode property keys,
-+    # make it simple.
-+    return str(s).translate(None, table)
- 
- def sanitize_escaped(s):
-     """ Sanitize double-escaped unicode strings. """
-

sources

@@ -1 +1 @@
-c2435ddfdef0b9898852d72a85a45f0f  wicd-1.7.2.4.tar.gz
+162ca2e6f4ab903bb7ab2bc0adb7d1aa  wicd-1.7.3.tar.gz

wicd-1.7.1-DaemonClosing.patch

@@ -1,12 +0,0 @@
-diff -up wicd-1.7.1/wicd/wicd-daemon.py.orig wicd-1.7.1/wicd/wicd-daemon.py
---- wicd-1.7.1/wicd/wicd-daemon.py.orig	2012-02-02 11:38:26.000000000 -0500
-+++ wicd-1.7.1/wicd/wicd-daemon.py	2012-03-22 10:21:38.735140300 -0400
-@@ -812,7 +812,7 @@ class WicdDaemon(dbus.service.Object):
-         pass
- 
-     @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
--    def DaemonClosing(self):
-+    def DaemonClosing(self, arg1=None, arg2=None):
-         """ Emits a signal indicating the daemon will be closing. """
-         pass
- 

wicd-1.7.2.4-curses_bz894646.patch

@@ -1,46 +0,0 @@
-diff --git a/curses/curses_misc.py b/curses/curses_misc.py
-index a779fa3..99a7db9 100644
---- a/curses/curses_misc.py
-+++ b/curses/curses_misc.py
-@@ -314,9 +314,9 @@ class ComboBox(urwid.WidgetWrap):
-                     #Send key to underlying widget:
-                     self._w.keypress(dim, k)
- 
--        #def get_size(self):
--
--    def __init__(self,label='',list=[],attrs=('body','editnfc'),focus_attr='focus',use_enter=True,focus=0,callback=None,user_args=None):
-+    def __init__(self, label='', list=[], attrs=('body','editnfc'),
-+                 focus_attr='focus', use_enter=True, focus=0, callback=None,
-+                 user_args=None):
-         """
-         label     : bit of text that preceeds the combobox.  If it is "", then 
-                     ignore it
-@@ -349,7 +349,7 @@ class ComboBox(urwid.WidgetWrap):
-         # We need this to pick our keypresses
-         self.use_enter = use_enter
- 
--        self.focus = focus
-+        self._focus = focus
- 
-         self.callback = callback
-         self.user_args = user_args
-@@ -358,6 +358,19 @@ class ComboBox(urwid.WidgetWrap):
-         self.parent = None
-         self.ui = None
-         self.row = None
-+
-+    @property
-+    def focus(self):
-+        return self._focus
-+
-+    @focus.setter
-+    def focus(self, index):
-+        self._focus = index
-+
-+    @focus.deleter
-+    def focus(self):
-+        del self._focus
-+
-     def set_list(self,list):
-         self.list = list
- 

wicd-1.7.2.4-prof_name.patch

@@ -1,12 +0,0 @@
-diff -up wicd-1.7.2.4/curses/netentry_curses.py.orig wicd-1.7.2.4/curses/netentry_curses.py
---- wicd-1.7.2.4/curses/netentry_curses.py.orig	2014-11-25 11:22:47.141413897 -0500
-+++ wicd-1.7.2.4/curses/netentry_curses.py	2014-11-25 11:25:19.904413897 -0500
-@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin
-         self.set_values()
-         
-         self.prof_name = name
--        title = ''.join([_('Configuring preferences for wired profile'), self.prog_name])
-+        title = ''.join([_('Configuring preferences for wired profile'), self.prof_name])
-         self._w.header = urwid.Text( ('header',title),align='right' )
- 
-         self.set_values()

wicd-1.7.2.4-translate-args.patch

@@ -1,12 +0,0 @@
-diff -up wicd-1.7.2.4/wicd/misc.py.orig wicd-1.7.2.4/wicd/misc.py
---- wicd-1.7.2.4/wicd/misc.py.orig	2014-09-25 15:58:24.170052173 -0400
-+++ wicd-1.7.2.4/wicd/misc.py	2014-09-25 16:00:04.175052173 -0400
-@@ -433,7 +433,7 @@ def sanitize_config(s):
- 
-     # s is a dbus.String -- since we don't allow unicode property keys,
-     # make it simple.
--    return str(s).translate(None, table)
-+    return str(s).translate(table)
- 
- def sanitize_escaped(s):
-     """ Sanitize double-escaped unicode strings. """

wicd-1.7.2.4-unicode.patch

@@ -1,21 +0,0 @@
-diff -up wicd-1.7.2.4/curses/netentry_curses.py.unicode wicd-1.7.2.4/curses/netentry_curses.py
---- wicd-1.7.2.4/curses/netentry_curses.py.unicode	2012-02-11 15:35:45.000000000 -0500
-+++ wicd-1.7.2.4/curses/netentry_curses.py	2012-10-23 14:06:36.537948070 -0400
-@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin
-         self.set_values()
-         
-         self.prof_name = name
--        title = _('Configuring preferences for wired profile "$A"').replace('$A',self.prof_name)
-+        title = ''.join([_('Configuring preferences for wired profile'), self.prog_name])
-         self._w.header = urwid.Text( ('header',title),align='right' )
- 
-         self.set_values()
-@@ -386,7 +386,7 @@ class WirelessSettingsDialog(AdvancedSet
-         self.encrypt_types = misc.LoadEncryptionMethods()
-         self.set_values()
- 
--        title = _('Configuring preferences for wireless network "$A" ($B)').replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid'))
-+        title = ''.join([_('Configuring preferences for wireless network'), wireless.GetWirelessProperty(networkID,'essid'), "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')])
-         self._w.header = urwid.Text(('header',title),align='right' )
- 
-     def set_values(self):

wicd-1.7.3-DaemonClosing.patch

@@ -0,0 +1,12 @@
+diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py
+--- wicd-1.7.3/wicd/wicd-daemon.py.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/wicd/wicd-daemon.py	2015-04-09 10:27:54.203884159 -0400
+@@ -835,7 +835,7 @@ class WicdDaemon(dbus.service.Object, ob
+         pass
+ 
+     @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
+-    def DaemonClosing(self):
++    def DaemonClosing(self, arg1=None, arg2=None):
+         """ Emits a signal indicating the daemon will be closing. """
+         # By default, disconnect network links on close.
+         if not self.keep_connection:

wicd-1.7.3-dbus-failure.patch

@@ -1,8 +1,8 @@
-diff -up wicd-1.7.1/cli/wicd-cli.py.dbus-failure wicd-1.7.1/cli/wicd-cli.py
---- wicd-1.7.1/cli/wicd-cli.py.dbus-failure	2012-01-15 09:19:03.000000000 -0500
-+++ wicd-1.7.1/cli/wicd-cli.py	2012-02-10 15:26:31.709169719 -0500
-@@ -47,6 +47,10 @@ if not daemon:
-     print 'Error connecting to wicd via D-Bus.  Please make sure the wicd service is running.'
+diff -up wicd-1.7.3/cli/wicd-cli.py.orig wicd-1.7.3/cli/wicd-cli.py
+--- wicd-1.7.3/cli/wicd-cli.py.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/cli/wicd-cli.py	2015-04-09 10:25:48.171078635 -0400
+@@ -61,6 +61,10 @@ if not daemon:
+         'Please make sure the wicd service is running.'
      sys.exit(3)
  
 +if daemon is None:
@@ -12,11 +12,11 @@ diff -up wicd-1.7.1/cli/wicd-cli.py.dbus-failure wicd-1.7.1/cli/wicd-cli.py
  parser = optparse.OptionParser()
  
  parser.add_option('--network', '-n', type='int', default=-1)
-diff -up wicd-1.7.1/curses/wicd-curses.py.dbus-failure wicd-1.7.1/curses/wicd-curses.py
---- wicd-1.7.1/curses/wicd-curses.py.dbus-failure	2012-02-02 11:38:26.000000000 -0500
-+++ wicd-1.7.1/curses/wicd-curses.py	2012-02-10 15:26:31.709169719 -0500
-@@ -1037,6 +1037,10 @@ def setup_dbus(force=True):
-         print 'Error connecting to wicd via D-Bus.  Please make sure the wicd service is running.'
+diff -up wicd-1.7.3/curses/wicd-curses.py.orig wicd-1.7.3/curses/wicd-curses.py
+--- wicd-1.7.3/curses/wicd-curses.py.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/curses/wicd-curses.py	2015-04-09 10:25:48.184078719 -0400
+@@ -1277,6 +1277,10 @@ def setup_dbus(force=True):
+             'Please make sure the wicd service is running.'
          sys.exit(3)
  
 +    if daemon is None:
@@ -26,10 +26,10 @@ diff -up wicd-1.7.1/curses/wicd-curses.py.dbus-failure wicd-1.7.1/curses/wicd-cu
      netentry_curses.dbus_init(dbus_ifaces)
      return True
  
-diff -up wicd-1.7.1/gtk/gui.py.dbus-failure wicd-1.7.1/gtk/gui.py
---- wicd-1.7.1/gtk/gui.py.dbus-failure	2012-01-15 09:24:23.000000000 -0500
-+++ wicd-1.7.1/gtk/gui.py	2012-02-10 15:26:31.711170031 -0500
-@@ -158,6 +158,17 @@ class appGui(object):
+diff -up wicd-1.7.3/gtk/gui.py.orig wicd-1.7.3/gtk/gui.py
+--- wicd-1.7.3/gtk/gui.py.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/gtk/gui.py	2015-04-09 10:25:48.184078719 -0400
+@@ -183,6 +183,17 @@ class appGui(object):
              d.run()
              sys.exit(1)
  

wicd-1.7.3-remove-WHEREAREMYFILES.patch

@@ -1,9 +1,9 @@
-diff -up wicd-1.7.0/in/man=wicd-curses.8.in.orig wicd-1.7.0/in/man=wicd-curses.8.in
---- wicd-1.7.0/in/man=wicd-curses.8.in.orig	2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/man=wicd-curses.8.in	2010-05-19 09:20:00.000000000 -1000
-@@ -57,10 +57,6 @@ Bring up instructions on how to edit the
- .BR O
- Raise the Ad-Hoc network creation dialog
+diff -up wicd-1.7.3/in/man=wicd-curses.8.in.orig wicd-1.7.3/in/man=wicd-curses.8.in
+--- wicd-1.7.3/in/man=wicd-curses.8.in.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/man=wicd-curses.8.in	2015-04-09 10:24:30.923580121 -0400
+@@ -60,10 +60,6 @@ Raise the Ad-Hoc network creation dialog
+ .BR X
+ Show the list of saved wireless networks, to be able to remove them
  
 -.SH "FILES"
 -.TP
@@ -12,10 +12,10 @@ diff -up wicd-1.7.0/in/man=wicd-curses.8.in.orig wicd-1.7.0/in/man=wicd-curses.8
  .PP
  .SH "SEE ALSO"
  .BR wicd-client (1),
-diff -up wicd-1.7.0/in/scripts=wicd-client.in.orig wicd-1.7.0/in/scripts=wicd-client.in
---- wicd-1.7.0/in/scripts=wicd-client.in.orig	2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/scripts=wicd-client.in	2010-05-19 09:20:25.000000000 -1000
-@@ -6,10 +6,6 @@ NC=$(tput sgr0)
+diff -up wicd-1.7.3/in/scripts=wicd-client.in.orig wicd-1.7.3/in/scripts=wicd-client.in
+--- wicd-1.7.3/in/scripts=wicd-client.in.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/scripts=wicd-client.in	2015-04-09 10:24:30.923580121 -0400
+@@ -3,10 +3,6 @@
  if [ ! -d "$HOME/.wicd" ]; then
      mkdir -p "$HOME/.wicd"
  fi
@@ -24,11 +24,11 @@ diff -up wicd-1.7.0/in/scripts=wicd-client.in.orig wicd-1.7.0/in/scripts=wicd-cl
 -    ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
 -fi
  if [ "$DISPLAY" = "" ]; then
-     if [ -x "%BIN%wicd-curses" ]; then
-         if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then
-diff -up wicd-1.7.0/in/scripts=wicd-curses.in.orig wicd-1.7.0/in/scripts=wicd-curses.in
---- wicd-1.7.0/in/scripts=wicd-curses.in.orig	2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/scripts=wicd-curses.in	2010-05-19 09:20:36.000000000 -1000
+     BOLD=$(tput bold)
+     BLUE=$(tput setaf 4)
+diff -up wicd-1.7.3/in/scripts=wicd-curses.in.orig wicd-1.7.3/in/scripts=wicd-curses.in
+--- wicd-1.7.3/in/scripts=wicd-curses.in.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/scripts=wicd-curses.in	2015-04-09 10:24:30.924580127 -0400
 @@ -2,8 +2,5 @@
  if [ ! -d "$HOME/.wicd" ]; then
      mkdir -p "$HOME/.wicd"
@@ -38,9 +38,9 @@ diff -up wicd-1.7.0/in/scripts=wicd-curses.in.orig wicd-1.7.0/in/scripts=wicd-cu
 -fi
  
  exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@
-diff -up wicd-1.7.0/in/scripts=wicd-gtk.in.orig wicd-1.7.0/in/scripts=wicd-gtk.in
---- wicd-1.7.0/in/scripts=wicd-gtk.in.orig	2010-01-14 18:49:11.000000000 -1000
-+++ wicd-1.7.0/in/scripts=wicd-gtk.in	2010-05-19 09:20:44.000000000 -1000
+diff -up wicd-1.7.3/in/scripts=wicd-gtk.in.orig wicd-1.7.3/in/scripts=wicd-gtk.in
+--- wicd-1.7.3/in/scripts=wicd-gtk.in.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/in/scripts=wicd-gtk.in	2015-04-09 10:24:30.924580127 -0400
 @@ -4,9 +4,5 @@
  if [ ! -d "$HOME/.wicd" ]; then
      mkdir -p "$HOME/.wicd"

wicd-1.7.3-sanitize.patch

@@ -1,7 +1,7 @@
-diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon.py
---- wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize	2014-07-02 11:24:51.171030709 -0400
-+++ wicd-1.7.2.4/wicd/wicd-daemon.py	2014-07-02 11:25:09.780030709 -0400
-@@ -1064,7 +1064,7 @@ class WirelessDaemon(dbus.service.Object
+diff -up wicd-1.7.3/wicd/wicd-daemon.py.orig wicd-1.7.3/wicd/wicd-daemon.py
+--- wicd-1.7.3/wicd/wicd-daemon.py.orig	2015-04-09 13:13:54.419639555 -0400
++++ wicd-1.7.3/wicd/wicd-daemon.py	2015-04-09 13:14:28.473858534 -0400
+@@ -1111,7 +1111,7 @@ class WirelessDaemon(dbus.service.Object
      def SetWirelessProperty(self, netid, prop, value):
          """ Sets property to value in network specified. """
          # We don't write script settings here.
@@ -10,16 +10,16 @@ diff -up wicd-1.7.2.4/wicd/wicd-daemon.py.sanitize wicd-1.7.2.4/wicd/wicd-daemon
          if prop.endswith('script'):
              print 'Setting script properties through the daemon' \
                    + ' is not permitted.'
-@@ -1265,7 +1265,7 @@ class WirelessDaemon(dbus.service.Object
+@@ -1321,7 +1321,7 @@ class WirelessDaemon(dbus.service.Object
      @dbus.service.method('org.wicd.daemon.wireless')
-     def SaveWirelessNetworkProperty(self, id, option):
+     def SaveWirelessNetworkProperty(self, nid, option):
          """ Writes a particular wireless property to disk. """
 -        option = misc.sanitize_config(option)
 +        option = misc.sanitize_config(str(option))
          if option.endswith("script"):
              print 'You cannot save script information to disk through ' + \
                    'the daemon.'
-@@ -1408,7 +1408,7 @@ class WiredDaemon(dbus.service.Object):
+@@ -1488,7 +1488,7 @@ class WiredDaemon(dbus.service.Object, o
      def SetWiredProperty(self, prop, value):
          """ Sets the given property to the given value. """
          if self.WiredNetwork:

wicd-1.7.3-unicode.patch

@@ -0,0 +1,26 @@
+diff -up wicd-1.7.3/curses/netentry_curses.py.orig wicd-1.7.3/curses/netentry_curses.py
+--- wicd-1.7.3/curses/netentry_curses.py.orig	2014-12-21 14:40:46.000000000 -0500
++++ wicd-1.7.3/curses/netentry_curses.py	2015-04-09 13:18:04.624248481 -0400
+@@ -340,8 +340,7 @@ class WiredSettingsDialog(AdvancedSettin
+         self.set_values()
+ 
+         self.prof_name = name
+-        title = _('Configuring preferences for wired profile "$A"'). \
+-            replace('$A', self.prof_name)
++        title = ' '.join([_('Configuring preferences for wired profile'), self.prof_name])
+         self._w.header = urwid.Text(('header', title), align='right')
+ 
+         self.set_values()
+@@ -502,9 +501,9 @@ class WirelessSettingsDialog(AdvancedSet
+         self.encrypt_types = misc.LoadEncryptionMethods()
+         self.set_values()
+ 
+-        title = _('Configuring preferences for wireless network "$A" ($B)'). \
+-            replace('$A', wireless.GetWirelessProperty(networkID, 'essid')). \
+-            replace('$B', wireless.GetWirelessProperty(networkID, 'bssid'))
++        title = ' '.join([_('Configuring preferences for wireless network'),
++                          wireless.GetWirelessProperty(networkID,'essid'),
++                          "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')])
+         self._w.header = urwid.Text(('header', title), align='right')
+ 
+     def set_values(self):

wicd.spec

@@ -8,26 +8,22 @@
 %define debug_package %{nil}
 
 Name:                wicd
-Version:             1.7.2.4
-Release:             15%{?dist}
+Version:             1.7.3
+Release:             1%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
 License:             GPLv2+
-URL:                 http://wicd.sourceforge.net/
-Source0:             http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL:                 https://launchpad.net/wicd/
+Source0:             https://launchpad.net/wicd/1.7/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:             org.wicd.daemon.service
 
-Patch0:              wicd-1.7.0-remove-WHEREAREMYFILES.patch
-Patch1:              wicd-1.7.1-dbus-failure.patch
+Patch0:              wicd-1.7.3-remove-WHEREAREMYFILES.patch
+Patch1:              wicd-1.7.3-dbus-failure.patch
 Patch2:              wicd-1.7.2.4-dbus-policy.patch
-Patch3:              wicd-1.7.1-DaemonClosing.patch
-Patch4:              wicd-1.7.2.4-unicode.patch
-Patch5:              770_769.diff
-Patch6:              wicd-1.7.2.4-curses_bz894646.patch
-Patch7:              wicd-1.7.2.4-sanitize.patch
-Patch8:              wicd-1.7.2.4-translate-args.patch
-Patch9:              wicd-1.7.2.4-prof_name.patch
+Patch3:              wicd-1.7.3-DaemonClosing.patch
+Patch4:              wicd-1.7.3-unicode.patch
+Patch5:              wicd-1.7.3-sanitize.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       babel
@@ -35,8 +31,8 @@ BuildRequires:       python2-devel
 BuildRequires:       desktop-file-utils
 BuildRequires:       pkgconfig
 BuildRequires:       systemd-units
+BuildRequires:       gettext
 
-Requires:            pm-utils >= 1.2.4
 Requires:            %{name}-common = %{version}-%{release}
 
 %description
@@ -109,29 +105,13 @@ Client program for wicd that uses a GTK+ interface.
 %patch3 -p1
 
 # Unicode string handling problems
-%patch4 -p1
-
-# Upstream patch:
-# http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/770
-# For https://bugzilla.redhat.com/show_bug.cgi?id=981667
-%patch5 -p0
-
-# Fix curses client crash on startup.
-# https://bugzilla.redhat.com/show_bug.cgi?id=894646
-%patch6 -p1
+%patch4 -p1 -b .orig
 
 # Prevent crash when saving network settings
 # Upstream bug report and patch:
 # https://bugs.launchpad.net/wicd/+bug/993912
-%patch7 -p1
+%patch5 -p1
 
-# translate() on a string requires the table as the first argument
-# https://bugzilla.redhat.com/show_bug.cgi?id=1005515
-%patch8 -p1
-
-# self.prog_name should be self.prof_name (#1162118)
-%patch9 -p1
- 
 %build
 rm -f po/ast.po
 %{__python} setup.py configure \
@@ -140,10 +120,11 @@ rm -f po/ast.po
     --share %{_datadir}/wicd \
     --etc %{_sysconfdir}/wicd \
     --bin %{_bindir} \
-    --pmutils %{_libdir}/pm-utils/sleep.d \
     --log %{_localstatedir}/log \
     --systemd %{_systemd_unitdir} \
-    --no-install-init
+    --no-install-init \
+    --no-install-pmutils \
+    --no-install-gnome-shell-extensions
 %{__python} setup.py build
 %{__python} setup.py compile_translations
 
@@ -214,11 +195,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/pm-utils/sleep.d/55wicd
+%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES
 
 %files common -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES LICENSE NEWS README other/WHEREAREMYFILES
 %dir %{python_sitelib}/wicd
 %dir %{_sysconfdir}/wicd
 %dir %{_sysconfdir}/wicd/encryption
@@ -243,11 +223,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/psu
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/ttls
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-hex
+%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-hex
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-passphrase
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wep-shared
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wired_8021x
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk
+%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-psk-hex
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa-peap
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap
 %config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap
@@ -291,16 +273,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files gtk
 %defattr(-,root,root,-)
 %dir %{_datadir}/wicd/gtk
-%dir %{_datadir}/pixmaps/wicd
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
-%{_datadir}/wicd/gtk/*
-%{_datadir}/pixmaps/wicd/*
 %{_datadir}/pixmaps/wicd-gtk.xpm
+%{_datadir}/wicd/gtk/*
 %{_bindir}/wicd-gtk
 %{_datadir}/icons/hicolor/*/apps/wicd-gtk.png
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
+%dir %{_datadir}/wicd/icons
+%{_datadir}/wicd/icons/*
 
 %changelog
+* Tue May 05 2015 David Cantrell <dcantrell@redhat.com> - 1.7.3-1
+- Upgrade to wicd-1.7.3 (#1190304)
+
+* Thu Apr 09 2015 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-16
+- Remove dependency on pm-utils (#1208313)
+
 * Tue Nov 25 2014 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-15
 - self.prog_name -> self.prof_name in netentry_curses.py (#1162118)