[packages/wicd] - updated to 1.7.3
baggins
baggins at pld-linux.org
Sat Jul 11 15:21:57 CEST 2015
commit 35df0b399554006500b17deac48ab31882c28635
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jul 11 15:21:43 2015 +0200
- updated to 1.7.3
dbus-unicode.patch | 16 -------------
urwid-fix1.patch | 66 ------------------------------------------------------
urwid-fix2.patch | 43 -----------------------------------
wicd.spec | 17 ++++++++------
4 files changed, 10 insertions(+), 132 deletions(-)
---
diff --git a/wicd.spec b/wicd.spec
index ed1188e..87f73dd 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,12 +9,12 @@ Summary: wired and wireless network manager
Summary(hu.UTF-8): Vezeték és vezeték néklküli hálózati menedzser
Summary(pl.UTF-8): Zarządca sieci przewodowych i bezprzewodowych
Name: wicd
-Version: 1.7.2.4
-Release: 4
+Version: 1.7.3
+Release: 1
License: GPL v2+
Group: X11/Applications/Networking
Source0: https://launchpad.net/wicd/1.7/%{version}/+download/wicd-%{version}.tar.gz
-# Source0-md5: c2435ddfdef0b9898852d72a85a45f0f
+# Source0-md5: 162ca2e6f4ab903bb7ab2bc0adb7d1aa
Source1: %{name}.init
Source2: %{name}.service
Source3: org.%{name}.daemon.service
@@ -153,9 +153,9 @@ Skrypt wicd dla pm-utils.
%patch1 -p1
%patch2 -p1
%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
mv po/{ar_EG,ar}.po
rm po/ast.po
@@ -164,6 +164,7 @@ grep -r bin/env.*python -l . | xargs %{__sed} -i -e '1s,^#!.*env python,#!%{__py
%build
%{__python} setup.py configure \
+ --no-install-gnome-shell-extensions \
--pidfile /var/run/wicd.pid \
--pmutils %{_libdir}/pm-utils/sleep.d
@@ -271,7 +272,9 @@ fi
%attr(755,root,root) %{_datadir}/%{name}/gtk/*.py
%{_desktopdir}/wicd.desktop
%{_iconsdir}/hicolor/*/apps/wicd-gtk.*
-%{_pixmapsdir}/%{name}
+%{_datadir}/%{name}/icons/hicolor/*/devices/*.png
+%{_datadir}/%{name}/icons/hicolor/*/devices/*.svg
+%{_datadir}/%{name}/icons/hicolor/*/status/*.png
%{_pixmapsdir}/wicd-gtk.xpm
%{_mandir}/man1/wicd-client.1*
%lang(nl) %{_mandir}/nl/man1/wicd-client.1*
diff --git a/dbus-unicode.patch b/dbus-unicode.patch
deleted file mode 100644
index 2fddc9a..0000000
--- a/dbus-unicode.patch
+++ /dev/null
@@ -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. """
-
diff --git a/urwid-fix1.patch b/urwid-fix1.patch
deleted file mode 100644
index 63eba2e..0000000
--- a/urwid-fix1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py 2012-05-06 15:16:15 +0000
-+++ curses/curses_misc.py 2012-11-15 09:26:21 +0000
-@@ -349,7 +349,10 @@
- # We need this to pick our keypresses
- self.use_enter = use_enter
-
-- self.focus = focus
-+ if urwid.VERSION < (1, 1, 0):
-+ self.focus = focus
-+ else:
-+ self.focus_position = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -362,7 +365,11 @@
- self.list = list
-
- def set_focus(self,index):
-- self.focus = index
-+ if urwid.VERSION < (1, 1, 0):
-+ self.focus = index
-+ else:
-+ self.focus_position = index
-+
- # API changed between urwid 0.9.8.4 and 0.9.9
- try:
- self.cbox.set_w(SelText(self.list[index]+self.DOWN_ARROW))
-@@ -376,16 +383,21 @@
- def build_combobox(self,parent,ui,row):
- str,trash = self.label.get_text()
-
-- self.cbox = DynWrap(SelText([self.list[self.focus]+self.DOWN_ARROW]),
-+ if urwid.VERSION < (1, 1, 0):
-+ index = self.focus
-+ else:
-+ index = self.focus_position
-+
-+ self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
- attrs=self.attrs,focus_attr=self.focus_attr)
- if str != '':
- w = urwid.Columns([('fixed',len(str),self.label),self.cbox],
- dividechars=1)
-- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
- pos=(len(str)+1,row))
- else:
- w = urwid.Columns([self.cbox])
-- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
- pos=(0,row))
-
- self._w = w
-@@ -419,7 +431,10 @@
- if self.overlay:
- return self.overlay._listbox.get_focus()
- else:
-- return None,self.focus
-+ if urwid.VERSION < (1, 1, 0):
-+ return None, self.focus
-+ else:
-+ return None, self.focus_position
-
- def get_sensitive(self):
- return self.cbox.get_sensitive()
-
diff --git a/urwid-fix2.patch b/urwid-fix2.patch
deleted file mode 100644
index 9a0bae6..0000000
--- a/urwid-fix2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py 2012-11-15 09:26:21 +0000
-+++ curses/curses_misc.py 2012-11-16 09:22:47 +0000
-@@ -352,7 +352,7 @@
- if urwid.VERSION < (1, 1, 0):
- self.focus = focus
- else:
-- self.focus_position = focus
-+ self._w.focus_position = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -368,7 +368,10 @@
- if urwid.VERSION < (1, 1, 0):
- self.focus = index
- else:
-- self.focus_position = index
-+ try:
-+ self._w.focus_position = index
-+ except IndexError:
-+ pass
-
- # API changed between urwid 0.9.8.4 and 0.9.9
- try:
-@@ -386,7 +389,7 @@
- if urwid.VERSION < (1, 1, 0):
- index = self.focus
- else:
-- index = self.focus_position
-+ index = self._w.focus_position
-
- self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
- attrs=self.attrs,focus_attr=self.focus_attr)
-@@ -434,7 +437,7 @@
- if urwid.VERSION < (1, 1, 0):
- return None, self.focus
- else:
-- return None, self.focus_position
-+ return None, self._w.focus_position
-
- def get_sensitive(self):
- return self.cbox.get_sensitive()
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wicd.git/commitdiff/35df0b399554006500b17deac48ab31882c28635
More information about the pld-cvs-commit
mailing list