summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/heartbeat/PKGBUILD10
-rw-r--r--pcr/pacemaker/PKGBUILD15
2 files changed, 12 insertions, 13 deletions
diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD
index cf2269d70..f9ee9254b 100644
--- a/pcr/heartbeat/PKGBUILD
+++ b/pcr/heartbeat/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=heartbeat
pkgver=3.0.5
_pkgver=${pkgver::1}_${pkgver:2:1}
-pkgrel=9
+pkgrel=10
pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)'
arch=(
i686
@@ -20,10 +20,7 @@ depends=(
gnutls
cluster-glue
)
-optdepends=(
- net-tools
- openssh
-)
+optdepends=net-tools
makedepends=(
docbook-xsl
libxslt
@@ -186,7 +183,8 @@ package() {
cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
setarch $CARCH make DESTDIR=$pkgdir install
- rm $pkgdir/etc/rc.d/$pkgname && rmdir $pkgdir/etc/rc.d
+ mv $pkgdir/{var/,}run
+ rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d
install -d $pkgdir/usr/lib/systemd/system
echo '[Unit]' > $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD
index 10d32ad33..3a6b2f22b 100644
--- a/pcr/pacemaker/PKGBUILD
+++ b/pcr/pacemaker/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=pacemaker
pkgver=1.1.9
-pkgrel=4
+pkgrel=5
pkgdesc='Cluster resource manager (Linux-HA)'
arch=(
i686
@@ -15,17 +15,15 @@ license=GPL2
depends=(
corosync
heartbeat
- jre7-openjdk
- resource-agent
libqb
libxslt
- #saxon.jar?
+ resource-agent
+ #saxon-he
)
-optdepens=openssh
makedepends=(
+ asciidoc
help2man
inkscape
- libxslt
lynx
openssh
valgrind
@@ -194,6 +192,7 @@ build() {
--libdir=/usr/lib\
--libexecdir=/usr/lib\
--localstatedir=/var\
+ --sbindir=/usr/bin\
--sysconfdir=/etc\
--with-acl\
--with-ais\
@@ -215,7 +214,9 @@ package() {
cd $srcdir/$pkgname-${pkgname^}-$pkgver
setarch $CARCH make DESTDIR=$pkgdir install
- mv $pkgdir/usr/sbin/cibsecret{,-$pkgname}
+ rm /etc/rc.d/pacemaker{_remote,} && rmdir /etc{/rc.d,}
+ mv $pkgdir/{var/,}run
+ mv $pkgdir/usr/bin/cibsecret{,-$pkgname}
}
# vim:set ts=2 sw=2 et: