Sat Apr 12 03:57:05 UTC 2014

1 files changed, 15 insertions, 19 deletions

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index d45c4cc54..a7b4718d8 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108727 2014-04-02 09:41:48Z spupykin $
+# $Id: PKGBUILD 109138 2014-04-10 17:34:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.2.3
-pkgrel=1
+pkgrel=3
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -68,19 +68,24 @@ md5sums=('ad1602a2fcc3609c83b885a28f3eecbd'
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-#  patch -p1 <"$srcdir/FS#38546.patch"
-}
-
-build() {
-  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 \
@@ -89,10 +94,6 @@ build() {
 	--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() {
@@ -102,15 +103,10 @@ package() {
 
   install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
   install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests
-
-  # systemd stuff
   install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
-#  mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
 
   rm -rf \
 	"$pkgdir"/var/run \
 	"$pkgdir"/etc/sysconfig \
-	"$pkgdir"/etc/rc.d/init.d \
-	"$pkgdir"/lib \
-	"$pkgdir"/etc/sysctl.d
+	"$pkgdir"/etc/rc.d
 }