wicd: fix package

- configure to use dhclient and kdesu by default
  (the default dhcpcd does not work)
- use included .desktop files instead of providing extra
- allow users in network group to control daemon via dbus
This commit is contained in:
mobinmob 2020-05-06 00:11:15 +03:00 committed by Đoàn Trần Công Danh
parent e528563e0f
commit f050dcadde
4 changed files with 22 additions and 19 deletions

View file

@ -5,4 +5,5 @@ boot, please disable them before using wicd. You can do that with:
# rm -f /var/service/{dhcpcd,wpa_supplicant} # rm -f /var/service/{dhcpcd,wpa_supplicant}
ATTENTION: to make wicd work for your user, it must be a member ATTENTION: to make wicd work for your user, it must be a member
of the 'users' group. of the 'network' group. You may need 'kdesu' for privilege
elevation.

View file

@ -0,0 +1,9 @@
[Settings]
always_show_wired_interface = True
auto_reconnect = True
wired_connect_mode = 0
dhcp_client = 1
sudo_app = 2
prefer_wired = True
show_never_connect = True

View file

@ -1,11 +0,0 @@
[Desktop Entry]
Categories=Application;Network;Internet;
Encoding=UTF-8
Exec=/usr/bin/wicd-client -n
GenericName=Network Manager
Icon=wicd-gtk.png
Comment=Manage Wired/Wireless Networks
Name=Wicd
Terminal=false
Type=Application
Version=1.0

View file

@ -1,19 +1,17 @@
# Template file for 'wicd' # Template file for 'wicd'
pkgname=wicd pkgname=wicd
version=1.7.4 version=1.7.4
revision=4 revision=5
archs=noarch archs=noarch
pycompile_module="wicd"
pycompile_dirs="usr/lib/wicd usr/share/wicd"
hostmakedepends="python python-setuptools python-Babel" hostmakedepends="python python-setuptools python-Babel"
depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid depends="dbus-glib dhclient ethtool net-tools python-dbus python-gobject2 python-urwid
util-linux wireless_tools wpa_supplicant" util-linux wireless_tools wpa_supplicant"
conf_files=" conf_files="
/etc/dbus-1/system.d/wicd.conf /etc/dbus-1/system.d/wicd.conf
/etc/wicd/encryption/templates/active" /etc/wicd/encryption/templates/active"
short_desc="Open source wired and wireless network manager" short_desc="Open source wired and wireless network manager"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2" license="GPL-2.0-only"
homepage="http://wicd.sourceforge.net" homepage="http://wicd.sourceforge.net"
distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz" distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz"
checksum=67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62 checksum=67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62
@ -25,12 +23,18 @@ do_build() {
--suspend=/usr/share/wicd/scripts \ --suspend=/usr/share/wicd/scripts \
--python=/usr/bin/python2 --lib=/usr/lib \ --python=/usr/bin/python2 --lib=/usr/lib \
--sbin=/usr/bin --distro=arch \ --sbin=/usr/bin --distro=arch \
--no-install-gnome-shell-extensions --no-install-gnome-shell-extensions \
--wicdgroup=network
} }
do_install() { do_install() {
python2 setup.py install --root=${DESTDIR} python2 setup.py install --root=${DESTDIR}
vinstall ${FILESDIR}/wicd.desktop 644 usr/share/applications vinstall other/wicd.desktop 644 usr/share/applications
vinstall other/wicd-tray.desktop 644 usr/share/applications
# Copy configuration to force use of dhclient.
vinstall ${FILESDIR}/manager-settings.conf 755 etc/wicd
vmkdir usr/lib/wicd vmkdir usr/lib/wicd
vcopy "build/lib/wicd/*.py" usr/lib/wicd vcopy "build/lib/wicd/*.py" usr/lib/wicd
chmod 755 ${DESTDIR}/usr/lib/wicd/*.py chmod 755 ${DESTDIR}/usr/lib/wicd/*.py