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 =================================================================== --- PKGBUILD 2014-04-26 23:03:37 UTC (rev 110206) +++ PKGBUILD 2014-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() {