From e3f70522f1f35359d9307f478c96dace20a51ca1 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 3 Nov 2012 01:15:19 -0700
Subject: Sat Nov  3 01:13:31 PDT 2012

---
 community/libvirt/PKGBUILD               | 14 +++++++++-----
 community/libvirt/libvirt.install        | 10 +++++-----
 community/libvirt/libvirtd-guests.conf.d |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'community/libvirt')

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 830e9fee7..505767fd8 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 79047 2012-10-29 16:19:15Z spupykin $
+# $Id: PKGBUILD 79301 2012-11-02 14:27:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.10.2
-pkgrel=4
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -36,11 +36,11 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d
 	openbsd-netcat-default.patch)
-md5sums=('a5e50860d9da238ba270b528411c4a0d'
+md5sums=('7c8b006de7338e30866bb56738803b21'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          'b47419dfd8c40d1b37fae6576d07baa0'
-         'bc2971dacdbac967fc3474e50affc345'
+         '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '8d98e62915785686b0b6c8c070628392'
          '456723b41903d3aaa7ec948c1feea265')
 
@@ -86,6 +86,10 @@ package() {
   install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf
   mv $pkgdir/lib/* $pkgdir/usr/lib/
 
+  sed -i \
+	's|After=.*|After=syslog.target network.target libvirtd.service|' \
+	$pkgdir/usr/lib/systemd/system/libvirt-guests.service
+
   rm -rf \
 	$pkgdir/var/run \
 	$pkgdir/etc/sysconfig \
diff --git a/community/libvirt/libvirt.install b/community/libvirt/libvirt.install
index 3881386d2..32c28d559 100644
--- a/community/libvirt/libvirt.install
+++ b/community/libvirt/libvirt.install
@@ -1,4 +1,5 @@
 _libvirt_setup() {
+  systemd-tmpfiles --create libvirt.conf
   rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
   echo ">>> To use libvirt as a non-root user:"
   echo ">>>  Use polkit to grant access."
@@ -16,16 +17,16 @@ post_install() {
   echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
   echo ">>>  booting."
   echo ""
-  /bin/true
 }
 
 post_upgrade() {
   _libvirt_setup || return 1
-  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
-  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
+  echo ">>> To finish the upgrade, restart libvirtd by:"
+  echo ">>>  'systemctl restart libvirtd' as root (systemd) or"
+  echo ">>>  '/etc/rc.d/libvirtd restart' as root (initscripts) or"
+  echo ">>>  rebooting."
   echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
   echo ""
-  /bin/true
 }
 
 post_remove() {
@@ -34,5 +35,4 @@ post_remove() {
    echo ">>>  It can be removed by running 'groupdel libvirt' as root."
    echo ""
    depmod -a
-   /bin/true
 }
diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d
index 02a933715..dd987611b 100644
--- a/community/libvirt/libvirtd-guests.conf.d
+++ b/community/libvirt/libvirtd-guests.conf.d
@@ -8,4 +8,4 @@ LIBVIRTD_BYPASS_CACHE=""
 
 LIBVIRTD_START_DELAY=0
 
-LIBVIRTD_SHUTDOWN_TIMEOUT=3
+LIBVIRTD_SHUTDOWN_TIMEOUT=60
-- 
cgit v1.2.3-54-g00ecf