Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=84e0f3bccc3de19257a5417e8e29c5a8db9aada7
commit 84e0f3bccc3de19257a5417e8e29c5a8db9aada7 Author: Miklos Vajna <[email protected]> Date: Sun Jun 17 22:22:22 2012 +0200 distcc-2.18.3-13-x86_64 - rc.distccd -> distccd.service diff --git a/source/devel-extra/distcc/FrugalBuild b/source/devel-extra/distcc/FrugalBuild index ec229f9..2d02591 100644 --- a/source/devel-extra/distcc/FrugalBuild +++ b/source/devel-extra/distcc/FrugalBuild @@ -6,7 +6,7 @@ USE_GUI=${USE_GUI:-"y"} pkgname=distcc pkgver=2.18.3 -pkgrel=12 +pkgrel=13 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.samba.org"; depends=('popt>=1.14-2' 'gcc>=4.3.1-3') @@ -17,10 +17,10 @@ backup=('etc/sysconfig/distccd') archs=('i686' 'x86_64' 'arm') up2date="lynx -dump http://distcc.samba.org/download.html | grep tar.bz2 | sed -ne 's/.*-\(.*\)\.t.*/\1/;s/systray-plugin-//;1 p'" source=(http://distcc.samba.org/ftp/distcc/$pkgname-$pkgver.tar.bz2 \ - rc.distccd \ + distccd.service \ distccd) sha1sums=('88e4c15826bdbc5a3de0f7c1bcb429e558c6976d' \ - '858b2052b43de850616ce29f0a3e658d484530c1' \ + '5740b28a83b3371407fc1b0d72e13c31ca190e71' \ '3a03e6937416dd3e1ce9b690857dcd5ed95cef50') if Fuse $USE_GUI; then @@ -38,7 +38,7 @@ build() { Fbuild --enable-rfc2553 Ffile /etc/sysconfig/distccd - Frcd2 distccd + Ffile /lib/systemd/system/distccd.service Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver Fmkdir /usr/lib/$pkgname/bin for i in $CHOST-{cc,c++,gcc,g++} diff --git a/source/devel-extra/distcc/distcc.install b/source/devel-extra/distcc/distcc.install index 8628f73..585b8ab 100644 --- a/source/devel-extra/distcc/distcc.install +++ b/source/devel-extra/distcc/distcc.install @@ -10,20 +10,9 @@ post_install() } -pre_upgrade() -{ - - if [ -e /sbin/service ]; then - /sbin/service distccd stop - fi -} - post_upgrade() { post_install - if [ -e /sbin/service ]; then - /sbin/service distccd start - fi } pre_remove() diff --git a/source/devel-extra/distcc/distccd.service b/source/devel-extra/distcc/distccd.service new file mode 100644 index 0000000..446a18a --- /dev/null +++ b/source/devel-extra/distcc/distccd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Distccd A Distributed Compilation Server +After=network.target + +[Service] +User=nobody +EnvironmentFile=-/etc/sysconfig/distccd +ExecStart=/usr/bin/distccd --verbose --no-detach --daemon $DISTCCD_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/source/devel-extra/distcc/rc.distccd b/source/devel-extra/distcc/rc.distccd deleted file mode 100644 index 3568e4d..0000000 --- a/source/devel-extra/distcc/rc.distccd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# (c) 2005 Tuxbubling <[email protected]> -# rc.distccd for Frugalware -# distributed under GPL License - -source /lib/initscripts/functions -. /etc/sysconfig/distccd || exit 1 - -# chkconfig: 2345 50 50 -# description: Start/stop distccd daemon - -daemon=$"distccd" -actions=(start stop status restart) - -pid="pidof distccd 2> /dev/null" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - if [ ! -e /var/log/distccd.log ]; then - touch /var/log/distccd.log - chown distccd /var/log/distccd.log - fi - /usr/bin/distccd $DISTCCD_ARGS - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ -n "$(eval $pid)" ]; then - killall distccd - ok $? - else - ok 999 - fi -} - -rc_exec $1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
