Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79120e81bc5dea7baaa8af761cc4c308c5a9b7c8
commit 79120e81bc5dea7baaa8af761cc4c308c5a9b7c8 Author: Miklos Vajna <[email protected]> Date: Mon Jan 28 21:27:39 2013 +0100 subversion-1.6.9-10-x86_64 - drop sysv support diff --git a/source/devel-extra/subversion/FrugalBuild b/source/devel-extra/subversion/FrugalBuild index 03a27eb..24721cf 100644 --- a/source/devel-extra/subversion/FrugalBuild +++ b/source/devel-extra/subversion/FrugalBuild @@ -3,7 +3,7 @@ pkgname=subversion pkgver=1.6.9 -pkgrel=9 +pkgrel=10 pkgdesc="A version control system that is a compelling replacement for CVS." url="http://subversion.tigris.org/"; depends=('neon>=0.28.5-4' 'apr-util>=1.3.12-3' 'apr>=1.2.12' 'db>=4.7.25' 'sqlite3' 'openssl>=1.0.0') @@ -11,7 +11,7 @@ makedepends=('krb5' 'swig>=1.3.34') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttarbz2 $url" -source=(http://$pkgname.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 rc.svnserve \ +source=(http://$pkgname.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 \ svnserve.service svnserve.sysconfig mod_dav_svn.conf) subpkgs=('mod_svn' "$pkgname-svnserve" "$pkgname-bindings") @@ -63,7 +63,6 @@ build() { # RUBY bindings install make DESTDIR=$Fdestdir install-swig-rb || Fdie - Frcd2 svnserve Ffile /etc/httpd/conf/modules.d/mod_dav_svn.conf Ffile /lib/systemd/system/svnserve.service @@ -90,7 +89,6 @@ build() { # Split SVN svnserve daemon and releated files Fsplit $pkgname-svnserve lib/systemd/system Fsplit $pkgname-svnserve etc/sysconfig - Fsplit $pkgname-svnserve etc/rc.d Fsplit $pkgname-svnserve usr/bin/svnserve Fsplit $pkgname-svnserve usr/man/man8/svnserve* Fsplit $pkgname-svnserve usr/man/man5/svnserve* @@ -107,7 +105,6 @@ build() { } sha1sums=('477aa89e60de7974ac0aa921cc369b4c2907693c' \ - 'fb9b8250c896f99c59b5b2f49fedec55a2e06c2a' \ '44dee68d91c602ff7ffab640845640272dabfaa8' \ '6ccc2c8d26a9ff195671f5575b6c099cc18601e3' \ 'b4012364a9fbd9e8c490a4819780c31c67940428') diff --git a/source/devel-extra/subversion/rc.svnserve b/source/devel-extra/subversion/rc.svnserve deleted file mode 100644 index a369fe8..0000000 --- a/source/devel-extra/subversion/rc.svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# (c) 2009 Priyank Gosalia <[email protected]> -# (c) 2005 Vajna Miklos <[email protected]> -# rc.svnserve for Frugalware -# distributed under GPL License - -# chkconfig: 2345 85 15 -# description: Server for the 'svn' repository access method - -source /lib/initscripts/functions -TEXTDOMAIN=svnserve - -actions=(start stop status restart) -daemon=$"svnserve" - -pid="pidof svnserve 2> /dev/null" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - svnserve -d - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ -n "$(eval $pid)" ]; then - killall svnserve - ok $? - else - ok 999 - fi -} - -rc_exec $1 - diff --git a/source/devel-extra/subversion/svnserve.install b/source/devel-extra/subversion/svnserve.install index 9ab5276..cd4cb6a 100644 --- a/source/devel-extra/subversion/svnserve.install +++ b/source/devel-extra/subversion/svnserve.install @@ -1,4 +1,3 @@ -sysvinit_units=(svnserve) systemd_units=(svnserve=) post_install() @@ -6,10 +5,6 @@ post_install() local unit local op - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - for i in ${systemd_units[@]}; do unit=$(echo $i | cut -f 1 -d '=') op=$(echo $i | cut -f 2 -d '=') @@ -24,10 +19,6 @@ post_install() post_upgrade() { - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - systemctl daemon-reload >/dev/null 2>&1 } @@ -35,10 +26,6 @@ pre_remove() { local unit - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - for i in ${systemd_units[@]}; do unit=$(echo $i | cut -f 1 -d '=') systemctl --no-reload disable $unit.service >/dev/null 2>&1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
