Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 26 insertions, 17 deletions

diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
index 4fe7b534b..4a459ffdc 100644
--- a/libre-testing/libretools/PKGBUILD
+++ b/libre-testing/libretools/PKGBUILD
@@ -8,8 +8,8 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130514
-_libretools_commit=b261c8585cf6aa9e7bf5b960b2a0a047d769dbae
+pkgver=20130522
+_libretools_commit=379ff751c59d528bd4f1a8e7a24fc039e8e408ba
 _devtools_commit=89d15e7697da2169493142f78a90b57a784d8f22
 
 _packages_url=https://projects.parabolagnulinux.org/packages
@@ -40,7 +40,7 @@ package_libretools() {
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
     tokyocabinet # `treepkg`
-    wget # `aur` and `pkgbuild-check-nonfree`
+    wget # `aur` and `lib/blacklist.sh`
   )
   optdepends=('namcap: to check package files')
 
@@ -57,5 +57,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('ce2a406d66033b48cacfb580997c1250'
+md5sums=('1fac1e8166cc5b686ed3fe6d99588c21'
          '21d77c519a7496185c40399d1cfa26bf')
diff --git a/pcr/ha-resourceagent/PKGBUILD b/pcr/ha-resourceagent/PKGBUILD
index a1588664b..56dc744fe 100644
--- a/pcr/ha-resourceagent/PKGBUILD
+++ b/pcr/ha-resourceagent/PKGBUILD
@@ -7,8 +7,8 @@ _yname=${_pkgname:8}
 _Name=${_xname^}_${_yname^}
 _name=${_xname}-${_yname}s
 pkgver=3.9.5
-pkgrel=1
-pkgdesc='A standardized interface for a cluster resource'
+pkgrel=2
+pkgdesc='Standardized interface for a cluster resource'
 arch=(
   i686
   x86_64
@@ -17,6 +17,16 @@ arch=(
 url=http://linux-ha.org/wiki/$_Name
 license=GPL
 depends=ha-glue
+optdepends=(
+  net-tools
+  openssh
+)
+makedepends=(
+  #libxslt
+  libvirt
+  net-tools
+  openssh
+)
 source=(
   https://github.com/ClusterLabs/$_name/archive/v$pkgver.tar.gz
   ha-ldirector.service
@@ -28,16 +38,22 @@ sha512sums=(
 
 prepare() {
   cd $srcdir/$_name-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
+         ' configure.ac
+  sed -i 's|INCLUDES|AM_CPPFLAGS|;
+         ' {heartbeat,tools}/Makefile.am
 }
 
 build() {
   cd $srcdir/$_name-$pkgver
   ./autogen.sh
   ./configure --prefix=/usr\
+    --enable-fatal-warnings\
+    --enable-libnet\
     --libdir=/usr/lib\
     --localstatedir=/var\
-    --sysconfdir=/etc
+    --sysconfdir=/etc\
+    --with-ocf-root=/usr/lib/ocf
   setarch $CARCH make
 }
 
@@ -45,15 +61,8 @@ package() {
   cd $srcdir/$_name-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
 
-  #python path correction
-  for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do
-    sed -i 's:/usr/bin/python$:/usr/bin/python2:g' $py
-  done
-  for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do
-    sed -i 's:/usr/bin/env python$:/usr/bin/env python2:g' $py
-  done
-  #end python path correction
-
   install -d $pkgdir/usr/lib/systemd/system
   install -Dm644 $srcdir/ha-ldirector.service $pkgdir/usr/lib/systemd/system
 }
+
+# vim:set ts=2 sw=2 et: