[arch-commits] Commit in libvirt/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Thursday, April 10, 2014 @ 19:34:31
  Author: spupykin
Revision: 109137

upgpkg: libvirt 1.2.3-3

upd

Modified:
  libvirt/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-10 17:21:08 UTC (rev 109136)
+++ PKGBUILD	2014-04-10 17:34:31 UTC (rev 109137)
@@ -4,7 +4,7 @@
 
 pkgname=libvirt
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -66,16 +66,26 @@
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '020971887442ebbf1b6949e031c8dd3f')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # python2 fix
-  export PYTHON=`which python2`
   for file in $(find . -name '*.py' -print); do
     sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  sed -i 's|/sysconfig/|/conf.d/|g' \
+    daemon/libvirtd.service.in \
+    tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
+    src/locking/virtlockd.service.in
+  sed -i 's|@sbindir@|/usr/bin|g' src/locking/virtlockd.service.in
+  sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  export PYTHON=`which python2`
   export LDFLAGS=-lX11
   export RADVD=/usr/bin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \
@@ -84,10 +94,6 @@
 	--with-qemu-user=nobody --with-qemu-group=nobody \
 	--without-netcf --with-interface --with-lxc
   make
-
-  sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service
-  sed -i 's|@sbindir@|/usr/bin|g' src/virtlockd.service
-  sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf
 }
 
 package() {