Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c53b9e94ccf681f8d45be71e8ce28ec15d2f633d
commit c53b9e94ccf681f8d45be71e8ce28ec15d2f633d Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Feb 21 23:03:34 2011 +0100 systemd-18-3-i686 - let systemd-gtk replace gservice diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index dbb9342..6af6b50 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -5,11 +5,10 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} USE_TCP=${USE_TCP:-"n"} USE_GUI=${USE_GUI:-"y"} -USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"y"} pkgname=systemd pkgver=18 -pkgrel=2 +pkgrel=3 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd" depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools') @@ -28,11 +27,7 @@ fi if Fuse $USE_TCP; then depends=("${depends[@]}" 'tcp_wrappers') fi -if ! Fuse $USE_SYSV_REPLACE; then - depends=("${depends[@]}" 'sysvinit') -else - depends=("${depends[@]}" 'systemd-sysvinit') -fi +rodepends=("${depends[@]}" 'systemd-sysvinit') groups=('base') archs=('i686' 'x86_64' 'ppc') @@ -48,7 +43,7 @@ if Fuse $USE_GUI; then subgroups=('xapps-extra') subarchs=('i686 x86_64 ppc') subprovides=('') - subreplaces=('') + subreplaces=('gservice') subconflicts=('') else replaces=("${replaces[@]}" 'systemd-gtk') @@ -58,13 +53,8 @@ subpkgs=("${subpkgs[@]}" 'systemd-sysvinit') subdescs=("${subdescs[@]}" 'systemd System V init tools') subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subdepends=("${subdepends[@]}" '') -if Fuse $USE_SYSV_REPLACE; then - subreplaces=("${subreplaces[@]}" 'sysvinit') - subgroups=("${subgroups[@]}" 'base') -else - subreplaces=("${subreplaces[@]}" '') - subgroups=("${subgroups[@]}" 'base-extra') -fi +subreplaces=("${subreplaces[@]}" 'sysvinit') +subgroups=("${subgroups[@]}" 'base') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') subprovides=("${subprovides[@]}" 'sysvinit') subconflicts=("${subconflicts[@]}" 'sysvinit') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git