[Frugalware-git] frugalware-current: wicd-1.7.1b2-2-i686 *clean up package *this version support python 2.7 and python 3

bouleetbil bouleetbil at frogdev.info
Sat Nov 27 19:12:57 CET 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8311083d0c1a30503a522144970f440ec22bab11

commit 8311083d0c1a30503a522144970f440ec22bab11
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Sat Nov 27 19:16:56 2010 +0000

wicd-1.7.1b2-2-i686
*clean up package
*this version support python 2.7 and python 3

diff --git a/source/xapps-extra/wicd/FrugalBuild b/source/xapps-extra/wicd/FrugalBuild
index 532adf8..8de8e5c 100644
--- a/source/xapps-extra/wicd/FrugalBuild
+++ b/source/xapps-extra/wicd/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=wicd
pkgver=1.7.1b2
-pkgrel=1
+pkgrel=2
pkgdesc="A wired and wireless network manager for Linux"
depends=('dbus-python' 'pygtk' 'dhcp' 'dhcpcd' 'wireless_tools' 'wpa_supplicant'\
'ethtool' 'python>=2.7' 'urwid' 'python-wpactrl' 'python-iwscan')
@@ -16,9 +16,7 @@ _F_sourceforge_realname="wicd-stable"
Finclude sourceforge gnome-scriptlet
source=($source rc.wicd)
sha1sums=('a7349537c6d3a2fdd0729b369f4ee6d33a6528a9' \
-          '5c77102e6f3365bf52afeb4706a74447bc28e7f0')
-
-#if you bump it verify if rm /etc/wicd/wired-settings.conf > /dev/null can be remove from rc script !!!
+          '3c4a5da2f7fa818517029921e0a389cc443e993e')

build() {
Fcd
diff --git a/source/xapps-extra/wicd/rc.wicd b/source/xapps-extra/wicd/rc.wicd
index 824f8c9..434066a 100644
--- a/source/xapps-extra/wicd/rc.wicd
+++ b/source/xapps-extra/wicd/rc.wicd
@@ -20,10 +20,6 @@ rc_start()
{
start_msg
if [[ "$(eval $pid)" == "" ]] ; then
-		#wicd is a little broken with python #4371
-		#so remove config file it's not a real fix but better that don't works
-		rm /etc/wicd/wired-settings.conf > /dev/null
-		rm /etc/wicd/wireles-settings.conf > /dev/null
/usr/sbin/wicd 2> /dev/null
ok $?
else
diff --git a/source/xapps-extra/wicd/wicd-no-deepcopy.patch b/source/xapps-extra/wicd/wicd-no-deepcopy.patch
deleted file mode 100644
index 04cac9a..0000000
--- a/source/xapps-extra/wicd/wicd-no-deepcopy.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- wicd/configmanager.py	2010-01-15 05:49:11.000000000 +0100
-+++ wicd/configmanager.py.new	2010-10-05 22:10:33.267799689 +0200
-@@ -176,28 +176,35 @@
-
-
-     def _copy_section(self, name):
--        # Yes, deepcopy sucks, but it is robust to changes in both
--        # this class and RawConfigParser.
--        p = copy.deepcopy(self)
--        for sname in p.sections():
--            if sname != name:
--                p.remove_section(sname)
-+        p = ConfigManager("", self.debug, self.mrk_ws)
-+        p.add_section(name)
-+        for (iname, value) in self.items(name):
-+            p.set(name, iname, value)
-+        # Store the filename this section was read from.
-         p.config_file = p.get_option(name, '_filename_', p.config_file)
-         p.remove_option(name, '_filename_')
-         return p
-
-     def write(self):
-         """ Writes the loaded config file to disk. """
--        # Really don't like this deepcopy.
--        p = copy.deepcopy(self)
--        for sname in p.sections():
--            fname = p.get_option(sname, '_filename_')
-+        in_this_file = []
-+        for sname in self.sections():
-+            fname = self.get_option(sname, '_filename_')
-             if fname and fname != self.config_file:
-+                # Write sections from other files
-                 section = self._copy_section(sname)
--                p.remove_section(sname)
-                 section._write_one()
-+            else:
-+                # Save names of local sections
-+                in_this_file.append(sname)
-
--        for sname in p.sections():
-+        # Make an instance with only these sections
-+        p = ConfigManager("", self.debug, self.mrk_ws)
-+        p.config_file = self.config_file
-+        for sname in in_this_file:
-+            p.add_section(sname)
-+            for (iname, value) in self.items(sname):
-+                p.set(sname, iname, value)
-             p.remove_option(sname, '_filename_')
-         p._write_one()
-


More information about the Frugalware-git mailing list