diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-12-19 19:26:26 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-12-19 19:26:26 (GMT) |
| commit | feda35810dff24107c51d15cac5ad22c3ba64139 (patch) | |
| tree | f268dc6e8478ee85a14fe053ae1d0ff6cdd9ae2e | |
| parent | 9f972b757f89868f1cf240ce536fe0a663587228 (diff) | |
| download | linhes_pkgbuild-feda35810dff24107c51d15cac5ad22c3ba64139.zip linhes_pkgbuild-feda35810dff24107c51d15cac5ad22c3ba64139.tar.gz linhes_pkgbuild-feda35810dff24107c51d15cac5ad22c3ba64139.tar.bz2 | |
supplemental-web: add local-website as a conflicts
| -rw-r--r-- | abs/core/supplemental-web/PKGBUILD | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 0ac38a4..dd73d51 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=supplemental-web pkgname=('supplemental-web' 'supplemental-web-slave') pkgver=8.0 -pkgrel=14 +pkgrel=15 arch=('i686' 'x86_64') license=('GPL') backup=('data/srv/httpd/cgi/extra.cfg.txt') @@ -9,9 +9,10 @@ source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh slaveserve.py supple package_supplemental-web() { pkgdesc="supplemental-web package for master backend" - depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50' 'shellinabox') + depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'shellinabox') install=supplemental-web.install replaces='local-website' + conflicts='local-website' MVDIR=$pkgdir/usr/MythVantage install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf @@ -31,7 +32,7 @@ package_supplemental-web() { package_supplemental-web-slave() { pkgdesc="supplemental-web package for slave backend" depends=('python2' 'func' 'python_aosd' 'LinHES-system>=2-50') - conflicts="supplemental-web" + conflicts=("supplemental-web" "local-website") mkdir -p $pkgdir/data/srv/httpd/ cp -rp $startdir/cgi $pkgdir/data/srv/httpd/ chown -R root:root $pkgdir/data/srv/httpd/ |