From ba68bda38404ec37114830973719146a7202126f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 Sep 2014 17:09:05 +0200 Subject: [PATCH] wicd: switch to INSTALL.msg; add systemd build option. --- srcpkgs/wicd/{INSTALL => INSTALL.msg} | 15 +-------------- srcpkgs/wicd/template | 12 +++++++----- 2 files changed, 8 insertions(+), 19 deletions(-) rename srcpkgs/wicd/{INSTALL => INSTALL.msg} (60%) diff --git a/srcpkgs/wicd/INSTALL b/srcpkgs/wicd/INSTALL.msg similarity index 60% rename from srcpkgs/wicd/INSTALL rename to srcpkgs/wicd/INSTALL.msg index ee3f13c6979..ba4130de97a 100644 --- a/srcpkgs/wicd/INSTALL +++ b/srcpkgs/wicd/INSTALL.msg @@ -1,25 +1,12 @@ -# -# This script will suggest the user to remove services that could -# interfere with wicd at startup. -# -case "${ACTION}" in -pre) - ;; -post) - cat << _EOF ===================================================================== Please note that wicd does not require to have dhcpcd and/or wpa_supplicant services running at boot. If you are using them at boot, please disable them before using wicd. You can do that with: -$ systemctl stop dhcpcd.service wpa_supplicant.service -$ systemctl disable dhcpcd.service wpa_supplicant.service + # rm -f /var/service/{dhcpcd,wpa_supplicant} ATTENTION: to make wicd work for your user, it must be a member of the 'users' group. ===================================================================== -_EOF - ;; -esac diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index 2ebed28474a..1403b37f5c9 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -4,8 +4,6 @@ version=1.7.2.4 revision=7 noarch=yes hostmakedepends="python python-setuptools python-babel" -makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib python-dbus - rfkill python-gobject2 python-urwid>=0.9.9 python-setuptools python-babel" depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid rfkill wireless_tools wpa_supplicant" pycompile_module="wicd" @@ -13,7 +11,6 @@ pycompile_dirs="usr/lib/wicd usr/share/wicd" conf_files=" /etc/dbus-1/system.d/wicd.conf /etc/wicd/encryption/templates/active" -systemd_services="wicd.service on" short_desc="Open source wired and wireless network manager" maintainer="Juan RP " homepage="http://wicd.sourceforge.net" @@ -21,12 +18,17 @@ license="GPL-2" distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz" checksum=dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 +build_options="systemd" + do_build() { + if [ "${build_option_systemd}" ]; then + _args="--systemd=/usr/lib/systemd/system" + fi python setup.py configure --verbose --no-install-init \ --resume=/usr/share/wicd/scripts \ --suspend=/usr/share/wicd/scripts \ - --python=/usr/bin/python2 --lib=/usr/lib --sbin=/usr/sbin \ - --systemd=/usr/lib/systemd/system + --python=/usr/bin/python2 --lib=/usr/lib \ + --sbin=/usr/sbin ${_args} #HACK for https://bugs.launchpad.net/wicd/+bug/928589 mkdir -p translations/ast/LC_MESSAGES