From aee6f3e3ce2f69700eb0f0d180d8372ba959d9e7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 13 Oct 2014 14:09:25 +0200 Subject: [PATCH] wicd: added runit service. --- srcpkgs/wicd/files/wicd/run | 3 +++ srcpkgs/wicd/template | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100755 srcpkgs/wicd/files/wicd/run diff --git a/srcpkgs/wicd/files/wicd/run b/srcpkgs/wicd/files/wicd/run new file mode 100755 index 00000000000..813cd953813 --- /dev/null +++ b/srcpkgs/wicd/files/wicd/run @@ -0,0 +1,3 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +exec wicd --no-daemon diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index d7b1ca195f6..5bb98770a95 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,7 +1,7 @@ # Template file for 'wicd' pkgname=wicd version=1.7.2.4 -revision=10 +revision=11 noarch=yes hostmakedepends="python python-setuptools python-Babel" depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid @@ -19,6 +19,7 @@ distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.ta checksum=dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 build_options="systemd" +replaces="runit-void<20141013_2" do_build() { if [ "${build_option_systemd}" ]; then @@ -34,7 +35,6 @@ do_build() { mkdir -p translations/ast/LC_MESSAGES msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo } - do_install() { python setup.py install --root=${DESTDIR} @@ -42,6 +42,7 @@ do_install() { vmkdir usr/lib/wicd vcopy "build/lib/wicd/*.py" usr/lib/wicd chmod 755 ${DESTDIR}/usr/lib/wicd/*.py + vsv wicd rm -rf ${DESTDIR}/lib rm -rf ${DESTDIR}/usr/share/doc @@ -51,8 +52,7 @@ do_install() { wicd-gtk_package() { noarch=yes - depends="${sourcepkg}>=${version} pygtk python-notify shared-mime-info - desktop-file-utils hicolor-icon-theme" + depends="wicd>=${version} pygtk python-notify shared-mime-info desktop-file-utils hicolor-icon-theme" short_desc+=" - GTK UI" pycompile_dirs="usr/share/wicd/gtk" pkg_install() {