Compare commits

...
Sign in to create a new pull request.

26 commits

Author SHA1 Message Date
Miro Hrončok
a41ebbd2ab Orphaned for 6+ weeks 2019-04-08 19:17:32 +02:00
Fedora Release Engineering
94cd0795b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 11:42:20 +00:00
441fb36941 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:54 +01:00
David Cantrell
5e145af3d2 Get wicd building correctly under rawhide again (#1606676)
Fix %{_unitdir} usage in the spec file
2018-07-24 14:54:45 -04:00
Fedora Release Engineering
5ad4e702cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:50:11 +00:00
Iryna Shcherbina
ddae43d1f7 Update Python 2 dependency declarations to new packaging standards 2018-02-09 23:39:08 +01:00
Fedora Release Engineering
3eac356f55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 20:55:55 +00:00
e5ca93f251 Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-18 22:49:19 +01:00
Fedora Release Engineering
7eff0d6285 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 10:16:24 +00:00
Fedora Release Engineering
25cb05879d - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:36:14 +00:00
Fedora Release Engineering
ce8c6c89ee - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 17:22:33 +00:00
Filipe Rosset
841eee5a4f - Rebuilt for new upstream release 1.7.4 fixes rhbz #1301799
- Fixes rhbz #1308240
2016-11-08 12:13:18 -02:00
Filipe Rosset
ae7742dcd7 Spec cleanup 2016-11-08 11:17:44 -02:00
Fedora Release Engineering
2179b70a4b - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 13:09:27 +00:00
Fedora Release Engineering
90b42cc9b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 03:01:37 +00:00
Dennis Gilmore
48ba61c71e - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 02:24:43 +00:00
David Cantrell
5474a54f73 Upgrade to wicd-1.7.3 (#1176990) 2015-05-05 14:47:11 -04:00
David Cantrell
0055b5a448 Upgrade to wicd-1.7.3 (#1176990) 2015-04-09 15:49:21 -04:00
David Cantrell
17a18bb8db Upgrade to wicd-1.7.3 (#1176990) 2015-04-09 15:38:11 -04:00
David Cantrell
65440e4966 Upgrade to wicd-1.7.3 (#1176990) 2015-04-09 15:32:06 -04:00
David Cantrell
59d72d40cc Upgrade to wicd-1.7.3 (#1176990) 2015-04-09 15:14:02 -04:00
David Cantrell
b833dc34e0 Upgrade to wicd-1.7.3 (#1176990) 2015-04-09 14:46:15 -04:00
David Cantrell
96a18146b2 Upgrade to wicd-1.7.3 (#1176990) 2015-04-09 13:19:41 -04:00
David Cantrell
97a738e359 Remove dependency on pm-utils (#1208313) 2015-04-09 10:00:45 -04:00
David Cantrell
4a5124dbc2 Remove dependency on pm-utils (#1208313) 2015-04-09 09:16:22 -04:00
David Cantrell
7523d014a3 Remove dependency on pm-utils (#1208313) 2015-04-09 09:10:48 -04:00
15 changed files with 1 additions and 754 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
wicd-1.7.2.4.tar.gz

View file

@ -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. """

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned for 6+ weeks

View file

@ -1,11 +0,0 @@
# This D-Bus service activation file is only for systemd support since
# an auto-activated wicd would be quite surprising for those people
# who have wicd installed but turned off. Thus the Exec path available to
# D-Bus is /bin/false, but systemd knows the real Exec path due to the
# wicd systemd .service file.
[D-BUS Service]
Name=org.wicd.daemon
Exec=/bin/false
User=root
SystemdService=dbus-org.wicd.daemon.service

View file

@ -1 +0,0 @@
c2435ddfdef0b9898852d72a85a45f0f wicd-1.7.2.4.tar.gz

View file

@ -1,53 +0,0 @@
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
-.SH "FILES"
-.TP
-.I ~/.wicd/WHEREAREMYFILES
-Reminder that your network configuration files are not here ;-)
.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)
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
-# Make sure the user knows WHEREAREMYFILES ;-)
-if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
- 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
@@ -2,8 +2,5 @@
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
-if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
- ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
-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
@@ -4,9 +4,5 @@
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
-# Make sure the user knows WHEREAREMYFILES ;-)
-if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
- ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
-fi
exec %PYTHON% -O %SHARE%gtk/wicd-client.py $@

View file

@ -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

View file

@ -1,49 +0,0 @@
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.'
sys.exit(3)
+if daemon is None:
+ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
+ sys.exit(3)
+
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.'
sys.exit(3)
+ if daemon is None:
+ print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.'
+ sys.exit(3)
+
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):
d.run()
sys.exit(1)
+ if daemon is None:
+ errmsg = "Error connecting to wicd service via D-Bus." + \
+ "Please ensure the wicd service is running."
+ d = gtk.MessageDialog(parent=None,
+ flags=gtk.DIALOG_MODAL,
+ type=gtk.MESSAGE_ERROR,
+ buttons=gtk.BUTTONS_OK,
+ message_format=errmsg)
+ d.run()
+ sys.exit(1)
+
self.tray = tray
gladefile = os.path.join(wpath.gtk, "wicd.ui")

View file

@ -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

View file

@ -1,63 +0,0 @@
diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf.in
--- wicd-1.7.2.4/in/other=wicd.conf.in.dbus 2011-09-18 04:48:13.000000000 -0400
+++ wicd-1.7.2.4/in/other=wicd.conf.in 2014-06-30 10:29:35.968246038 -0400
@@ -7,41 +7,34 @@
<allow own="org.wicd.daemon"/>
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
- <allow send_destination="org.wicd.daemon.wireless"/>
- <allow send_interface="org.wicd.daemon.wireless"/>
- <allow send_destination="org.wicd.daemon.wired"/>
- <allow send_interface="org.wicd.daemon.wired"/>
+ <allow send_destination="org.wicd.daemon.wireless"/>
+ <allow send_interface="org.wicd.daemon.wireless"/>
+ <allow send_destination="org.wicd.daemon.wired"/>
+ <allow send_interface="org.wicd.daemon.wired"/>
</policy>
- <policy context="default">
- <deny own="org.wicd.daemon"/>
- </policy>
-
- <!-- This Unix group will have permission to use Wicd's gui -->
- <policy group="%WICDGROUP%">
+ <policy group="users">
+ <allow own="org.wicd.daemon"/>
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
- <allow send_interface="org.freedesktop.DBus.Introspectable"/>
- <!-- The Introspectable allow shouldn't be needed here, but
- it seems that a few distributions aren't yet allowing
- it in their hal configs, and we need it here, so... -->
+ <allow send_destination="org.wicd.daemon.wireless"/>
+ <allow send_interface="org.wicd.daemon.wireless"/>
+ <allow send_destination="org.wicd.daemon.wired"/>
+ <allow send_interface="org.wicd.daemon.wired"/>
</policy>
- <!-- Comment the block below if you do not want all users logged in
- locally to have permission to use wicd-client. This ignores the
- group based permission model defined above for the "%WICDGROUP%"
- group. Note that this only applies if you are using ConsoleKit -
- if you do not have ConsoleKit installed and in use, then this
- block makes no difference either way. -->
+ <policy context="default">
+ <deny own="org.wicd.daemon"/>
+ </policy>
<policy at_console="true">
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
- <allow send_destination="org.wicd.daemon.wireless"/>
- <allow send_interface="org.wicd.daemon.wireless"/>
- <allow send_destination="org.wicd.daemon.wired"/>
- <allow send_interface="org.wicd.daemon.wired"/>
- <allow send_interface="org.freedesktop.DBus.Introspectable"/>
+ <allow send_destination="org.wicd.daemon.wireless"/>
+ <allow send_interface="org.wicd.daemon.wireless"/>
+ <allow send_destination="org.wicd.daemon.wired"/>
+ <allow send_interface="org.wicd.daemon.wired"/>
+ <allow send_interface="org.freedesktop.DBus.Introspectable"/>
</policy>
</busconfig>

View file

@ -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()

View file

@ -1,30 +0,0 @@
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
def SetWirelessProperty(self, netid, prop, value):
""" Sets property to value in network specified. """
# We don't write script settings here.
- prop = misc.sanitize_config(prop)
+ prop = misc.sanitize_config(str(prop))
if prop.endswith('script'):
print 'Setting script properties through the daemon' \
+ ' is not permitted.'
@@ -1265,7 +1265,7 @@ class WirelessDaemon(dbus.service.Object
@dbus.service.method('org.wicd.daemon.wireless')
def SaveWirelessNetworkProperty(self, id, 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):
def SetWiredProperty(self, prop, value):
""" Sets the given property to the given value. """
if self.WiredNetwork:
- prop = misc.sanitize_config(prop)
+ prop = misc.sanitize_config(str(prop))
if prop.endswith('script'):
print 'Setting script properties through the daemon' \
+ ' is not permitted.'

View file

@ -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. """

View file

@ -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):

427
wicd.spec
View file

@ -1,427 +0,0 @@
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
%{!?_systemd_unitdir: %global _systemd_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
%define debug_package %{nil}
Name: wicd
Version: 1.7.2.4
Release: 15%{?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
Source1: org.wicd.daemon.service
Patch0: wicd-1.7.0-remove-WHEREAREMYFILES.patch
Patch1: wicd-1.7.1-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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: babel
BuildRequires: python2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
BuildRequires: systemd-units
Requires: pm-utils >= 1.2.4
Requires: %{name}-common = %{version}-%{release}
%description
Wicd is designed to give the user as much control over behavior of network
connections as possible. Every network, both wired and wireless, has its
own profile with its own configuration options and connection behavior.
Wicd will try to automatically connect only to networks the user specifies
it should try, with a preference first to a wired network, then to wireless.
This package provides the architecture-dependent components of wicd.
%package common
Summary: Wicd common files
Group: System Environment/Base
BuildArch: noarch
Requires: dbus
Requires: dbus-python
Requires: dhclient
Requires: ethtool
Requires: iproute
Requires: logrotate
Requires: net-tools
Requires: wireless-tools
Requires: wpa_supplicant
Requires: pygobject2
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
%description common
This package provides the main wicd daemon and the wicd-cli front-end.
%package curses
Summary: Curses client for wicd
Group: Applications/System
BuildArch: noarch
Requires: %{name}-common = %{version}-%{release}
Requires: python-urwid >= 0.9.8.3
Requires: %{name}-gtk = %{version}-%{release}
%description curses
Client program for wicd that uses a curses interface.
%package gtk
Summary: GTK+ client for wicd
Group: Applications/Internet
BuildArch: noarch
Requires: %{name}-common = %{version}-%{release}
Requires: notify-python
Requires: pygtk2-libglade >= 2.10
%description gtk
Client program for wicd that uses a GTK+ interface.
%prep
%setup -q
# 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
# Handle D-Bus connection failures a little better
%patch1 -p1
# Allow users at the console to control wicd
%patch2 -p1
# Work around bug in DaemonClosing() calls
%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
# Prevent crash when saving network settings
# Upstream bug report and patch:
# https://bugs.launchpad.net/wicd/+bug/993912
%patch7 -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 \
--distro redhat \
--lib %{_libdir} \
--share %{_datadir}/wicd \
--etc %{_sysconfdir}/wicd \
--bin %{_bindir} \
--pmutils %{_libdir}/pm-utils/sleep.d \
--log %{_localstatedir}/log \
--systemd %{_systemd_unitdir} \
--no-install-init
%{__python} setup.py build
%{__python} setup.py compile_translations
%install
rm -rf %{buildroot}
%{__python} setup.py install --skip-build --no-compile --root %{buildroot}
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-external.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/backends/be-ioctl.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/cli/wicd-cli.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/curses_misc.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/netentry_curses.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/curses/prefs_curses.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/daemon/wicd-daemon.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/gui.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/prefs.py
sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/wicd/gtk/wicd-client.py
rm -f %{buildroot}%{_localstatedir}/lib/wicd/WHEREAREMYFILES
rm -rf %{buildroot}%{_datadir}/doc
find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm
for lib in %{buildroot}%{python_sitelib}/wicd/*.py ; do
sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
touch -r $lib $lib.new &&
mv $lib.new $lib
done
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
mv %{buildroot}%{_sysconfdir}/logrotate.d/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
desktop-file-install \
--remove-category="Application" \
--delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/wicd.desktop
desktop-file-install \
--dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
%{buildroot}%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
%find_lang %{name}
%clean
rm -rf %{buildroot}
%post common
%systemd_post wicd.service
%preun common
%systemd_preun wicd.service
%postun common
%systemd_postun_with_restart wicd.service
%post gtk
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun gtk
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans gtk
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%{_libdir}/pm-utils/sleep.d/55wicd
%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
%dir %{_sysconfdir}/wicd/encryption/templates
%dir %{_sysconfdir}/wicd/scripts
%dir %{_sysconfdir}/wicd/scripts/postconnect
%dir %{_sysconfdir}/wicd/scripts/postdisconnect
%dir %{_sysconfdir}/wicd/scripts/preconnect
%dir %{_sysconfdir}/wicd/scripts/predisconnect
%{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
%{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
%config(noreplace) %{_sysconfdir}/logrotate.d/wicd
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/wicd.conf
%config(noreplace) %{_sysconfdir}/wicd/dhclient.conf.template.default
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/active_wired
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/eap-tls
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/leap
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/peap-tkip
%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-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-peap
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-leap
%config(noreplace) %{_sysconfdir}/wicd/encryption/templates/wpa2-peap
%{_systemd_unitdir}/wicd.service
%{python_sitelib}/wicd/*
%{python_sitelib}/wicd-%{version}*.egg-info
%{_bindir}/wicd-cli
%{_bindir}/wicd-client
%{_sbindir}/wicd
%{_datadir}/applications/wicd.desktop
%{_datadir}/dbus-1/system-services/org.wicd.daemon.service
%{_datadir}/man/man1/wicd-client.1*
%{_datadir}/man/man5/wicd-manager-settings.conf.5*
%{_datadir}/man/man5/wicd-wired-settings.conf.5*
%{_datadir}/man/man5/wicd-wireless-settings.conf.5*
%{_datadir}/man/man8/wicd-cli.8*
%{_datadir}/man/man8/wicd.8*
%lang(nl) %{_datadir}/man/nl/man1/wicd-client.1*
%lang(nl) %{_datadir}/man/nl/man5/wicd-manager-settings.conf.5*
%lang(nl) %{_datadir}/man/nl/man5/wicd-wired-settings.conf.5*
%lang(nl) %{_datadir}/man/nl/man5/wicd-wireless-settings.conf.5*
%lang(nl) %{_datadir}/man/nl/man8/wicd.8*
%dir %{_datadir}/wicd
%dir %{_datadir}/wicd/backends
%dir %{_datadir}/wicd/cli
%dir %{_datadir}/wicd/daemon
%{_datadir}/wicd/backends/*
%{_datadir}/wicd/cli/*
%{_datadir}/wicd/daemon/*
%dir %{_localstatedir}/lib/wicd
%dir %{_localstatedir}/lib/wicd/configurations
%files curses
%defattr(-,root,root,-)
%dir %{_datadir}/wicd/curses
%{_datadir}/wicd/curses/*
%{_bindir}/wicd-curses
%{_datadir}/man/man8/wicd-curses.8*
%lang(nl) %{_datadir}/man/nl/man8/wicd-curses.8*
%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
%{_bindir}/wicd-gtk
%{_datadir}/icons/hicolor/*/apps/wicd-gtk.png
%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
%changelog
* 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)
* Mon Sep 29 2014 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-14
- Remove check for daemon patch (#1074315)
* Thu Sep 25 2014 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-13
- Fix string.translate() usage in misc.py (#1005515)
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Wed Jul 02 2014 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-11
- Prevent crash when saving network settings (#996693)
* Mon Jun 30 2014 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-10
- Do not assume wicd-daemon is running when wicd-client runs (#1074315)
- Fix wicd-curses crash on startup (#894646)
- Edit default D-Bus policy file to allow 'users' group members to run
wicd client programs (#1074372)
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Dec 09 2013 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-8
- Apply upstream patch to fix exception when changing properties in
wicd-gtk (#981667)
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Apr 01 2013 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-6
- systemd_post_with_restart -> systemd_postun_with_restart (#901753)
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Oct 23 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-4
- Fix some Unicode string handling and display problems (#845749)
* Tue Oct 23 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-3
- Use new systemd macros in trigger scripts (#850367)
* Thu Aug 02 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-2
- Updated duplicate logrotate file fix (#820139)
* Thu Aug 02 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.4-1
- Upgrade to wicd-1.7.2.4
- Remove duplicate logrotate file (#820139)
- The curses package requires some code from the gtk module, so add explicit
dependency (#831309)
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Apr 13 2012 David Cantrell <dcantrell@redhat.com> - 1.7.2.1-1
- Upgrade to wicd-1.7.2.1 to fix CVE-2012-2095 (#811763)
* Mon Mar 26 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1-5
- Remove our wicd.service file, this is provided by upstream now
* Mon Mar 26 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1-4
- Make sure systemd unit files go to /usr/lib/systemd
- Stop mangling logfile.py so bytecompiling will actually work
- 91wicd -> 55wicd
- Pick up new encryption template files in the %%files list
* Thu Mar 22 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1-3
- BR babel
- Remove po/ast.po because babel doesn't understand it
* Thu Mar 22 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1-2
- Ensure wpath.etc is set to /etc/wicd, not /etc/dhcp (#754412)
- Initialize child_pid to None in wicd-daemon.py (#798692)
- Make wicd-gtk subpackage require notify-python (#748258)
- Work around no-op problem in DaemonClosing calls (#740317)
* Fri Feb 10 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1-1
- Upgrade to wicd-1.7.1 final release (#789380)
- Have wicd-common require pygobject2 (#754416)
- Remove patches that have been incorporated upstream
* Fri Jan 27 2012 David Cantrell <dcantrell@redhat.com> - 1.7.1b2-0.3
- Fix CVE-2012-0813 (#785147)
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-0.2.b2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Aug 19 2011 David Cantrell <dcantrell@redhat.com> - 1.7.1b2-0.1
- Upgrade to wicd-1.7.1b2
* Fri Aug 19 2011 David Cantrell <dcantrell@redhat.com> - 1.7.0-9
- Initialize appGui._wired_showing in __init__ (#723553)
- Make sure check and message in wicd-cli are a lambda (#712435)
- Correct systemd unit file for wicd, add D-Bus service file (#699116)
- Move docs to the wicd-common subpackage
- Correct /etc/dbus-1/system.d/wicd.conf (#699116)
* Mon May 09 2011 Bill Nottingham <notting@redhat.com> - 1.7.0-8
- fix systemd scriptlets for upgrade
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jan 15 2011 David Cantrell <dcantrell@redhat.com> - 1.7.0-6
- Correct typo with _systemd_unitdir macro usage in spec file
* Sat Jan 15 2011 David Cantrell <dcantrell@redhat.com> - 1.7.0-5
- Replace existing init script with systemd unit file (#661226)
* Fri Oct 22 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-4
- Use cPickle instead of deepcopy in configmanager.py (#645251)
* Wed Aug 25 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-3
- Remove hard dependency on the base package by wicd-common. The
base package is arch-specific and contains optional components
for wicd. If it is present, wicd will make use of it, but it is
not required for normal functionality.
* Fri Jul 30 2010 Thomas Spura <tomspur@fedoraproject.org> - 1.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Mon Jun 21 2010 David Cantrell <dcantrell@redhat.com> - 1.7.0-1
- Initial package