[arch-commits] Commit in openstack-guest-agents-unix/trunk (PKGBUILD)

2014-08-03 Thread Daniel Wallace 
Date: Sunday, August 3, 2014 @ 21:22:11
  Author: dwallace
Revision: 116802

upgpkg: openstack-guest-agents-unix 1:1.39.0-3

upgpkg: openstack-guest-agents-unit 1.39.0-3 fs #41445

Modified:
  openstack-guest-agents-unix/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-03 18:45:16 UTC (rev 116801)
+++ PKGBUILD2014-08-03 19:22:11 UTC (rev 116802)
@@ -2,7 +2,7 @@
 pkgname=openstack-guest-agents-unix
 pkgver=1.39.0
 epoch=1
-pkgrel=2
+pkgrel=3
 pkgdesc="This is the Unix Guest Agent for Openstack"
 arch=('i686' 'x86_64')
 url="https://github.com/rackerlabs/openstack-guest-agents-unix";
@@ -9,6 +9,7 @@
 license=('GPL')
 depends=('python2-simplejson' 'python2-crypto' 'patchelf' 'python2-xenstore')
 makedepends=('git')
+options=(!emptydirs)
 source=("$pkgname::git://github.com/rackerlabs/${pkgname%-git}#tag=v$pkgver")
 md5sums=('SKIP')
 
@@ -22,13 +23,15 @@
 build() {
   cd "$srcdir/$pkgname"
   sh autogen.sh
-  ./configure CC=gcc --sbindir=/usr/bin
-  make
+  ./configure CC=gcc --prefix=/usr --sbindir=/usr/bin --bindir=/usr/bin
+  make sbindir=/usr/bin/
 }
 
 package() {
   make -C "$srcdir/$pkgname" bintar
   tar -C "$pkgdir" -xf 
$srcdir/$pkgname/nova-agent-Linux-$CARCH-${pkgver}.tar.gz
+  install -dm755 $pkgdir/usr/bin
+  mv $pkgdir/usr/sbin/* $pkgdir/usr/bin/
   install -Dm644 $pkgname/scripts/systemd/nova-agent.service \
 $pkgdir/usr/lib/systemd/system/nova-agent.service
 }

[arch-commits] Commit in openstack-guest-agents-unix/trunk (PKGBUILD)

2014-04-26 Thread Daniel Wallace 
Date: Sunday, April 27, 2014 @ 01:24:01
  Author: dwallace
Revision: 110207

upgpkg: openstack-guest-agents-unix 1:1.39.0-2

newpkg: openstack-guest-agents-unix

Modified:
  openstack-guest-agents-unix/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-26 23:03:37 UTC (rev 110206)
+++ PKGBUILD2014-04-26 23:24:01 UTC (rev 110207)
@@ -2,23 +2,21 @@
 pkgname=openstack-guest-agents-unix
 pkgver=1.39.0
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="This is the Unix Guest Agent for Openstack"
 arch=('i686' 'x86_64')
 url="https://github.com/rackerlabs/openstack-guest-agents-unix";
 license=('GPL')
-depends=('python2-simplejson' 'python2-crypto' 'patchelf' 'python2-pyxenstore')
-#checkdepends=('python2-pyxenstore')
-replaces=('openstack-guest-agents-unix-git<1')
+depends=('python2-simplejson' 'python2-crypto' 'patchelf' 'python2-xenstore')
 makedepends=('git')
-source=("$pkgname::git://github.com/rackerlabs/${pkgname%-git}#tag=$pkgver")
+source=("$pkgname::git://github.com/rackerlabs/${pkgname%-git}#tag=v$pkgver")
 md5sums=('SKIP')
 
 prepare(){
-  mkdir "$srcdir/$pkgname/m4"
-  find "$srcdir/" -name \*.py -exec sed -i '1s/python$/&2/' {} +
-  git cherry-pick 387d4e77695598a07be9e4593c5b236b81a1aeea
-  git cherry-pick f9a365e7a9543d407ca9d75164688faa0ff53528
+  cd "$srcdir/$pkgname"
+  find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
+  git cherry-pick -n 387d4e77695598a07be9e4593c5b236b81a1aeea
+  git cherry-pick -n f9a365e7a9543d407ca9d75164688faa0ff53528
 }
 
 build() {