adopted and updated PKGBUILD

2 files changed, 78 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 236dfbf01929..ce40eb6e9fec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = libvirt-git
 	pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)
-	pkgver = 5.10.0.125.g97cafa610e
+	pkgver = 5.10.0.486.g529100d9f7
 	pkgrel = 1
 	url = http://libvirt.org/
 	install = libvirt.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	makedepends = git
 	makedepends = pkgconfig
 	makedepends = lvm2
 	makedepends = linux-api-headers
 	makedepends = dnsmasq
-	makedepends = libxslt
+	makedepends = rpcsvc-proto
+	makedepends = libiscsi
+	makedepends = python-docutils
 	makedepends = perl-xml-xpath
+	makedepends = libxslt
+	makedepends = git
 	makedepends = xhtml-docs
+	makedepends = rsync
+	makedepends = rpcsvc-proto
 	depends = e2fsprogs
 	depends = gnutls
 	depends = iptables
@@ -47,9 +52,9 @@ pkgbase = libvirt-git
 	depends = libssh2
 	depends = netcf
 	depends = perl-xml-xpath
-	optdepends = ebtables
-	optdepends = dnsmasq: for NAT/DHCP for guests
-	optdepends = bridge-utils: for briged networking (default)
+	optdepends = ebtables: required for default NAT networking
+	optdepends = dnsmasq: required for default NAT/DHCP for guests
+	optdepends = bridge-utils: for bridged networking
 	optdepends = openbsd-netcat: for remote management over ssh
 	optdepends = qemu
 	optdepends = radvd
@@ -97,9 +102,9 @@ pkgbase = libvirt-git
 	source = libvirtd-guests.conf.d
 	source = libvirt.tmpfiles.d
 	md5sums = SKIP
-        md5sums = 5e31269067dbd12ca871234450bb66bb
-        md5sums = 384fff96c6248d4f020f6fa66c32b357
-        md5sums = 020971887442ebbf1b6949e031c8dd3f
+	md5sums = 5e31269067dbd12ca871234450bb66bb
+	md5sums = 384fff96c6248d4f020f6fa66c32b357
+	md5sums = 020971887442ebbf1b6949e031c8dd3f
 
 pkgname = libvirt-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 316a3e1891bb..b2c37d42e703 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,76 +1,77 @@
 # $Id$
-# Maintainer: Arthur Borsboom <arthurborsboom@gmail.com>
+# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
+# Contributor: Arthur Borsboom <arthurborsboom@gmail.com>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt-git
-pkgver=5.10.0.125.g97cafa610e
+pkgver=5.10.0.486.g529100d9f7
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
 license=('LGPL')
 depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python'
-	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus' 'libxau' 'libxdmcp' 'libpcap' 'libcap-ng'
-	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2' 'libnl' 'libx11' 'numactl' 'gettext' 'ceph-libs' 'libssh2' 'netcf' 'perl-xml-xpath')
+     'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus' 'libxau' 'libxdmcp' 'libpcap' 'libcap-ng'
+     'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
+     'iproute2' 'libnl' 'libx11' 'numactl' 'gettext' 'ceph-libs' 'libssh2' 'netcf' 'perl-xml-xpath')
 makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'rpcsvc-proto'
-	     'libiscsi' 'perl-xml-xpath' 'libxslt' 'git' 'xhtml-docs' 'rsync' 'rpcsvc-proto')
+         'libiscsi' 'python-docutils' 'perl-xml-xpath' 'libxslt' 'git' 'xhtml-docs' 'rsync' 'rpcsvc-proto')
 optdepends=('ebtables: required for default NAT networking'
-	    'dnsmasq: required for default NAT/DHCP for guests'
-	    'bridge-utils: for bridged networking'
-	    'openbsd-netcat: for remote management over ssh'
-	    'qemu'
-	    'radvd'
-	    'dmidecode'
-	    'pm-utils: host power management')
+        'dnsmasq: required for default NAT/DHCP for guests'
+        'bridge-utils: for bridged networking'
+        'openbsd-netcat: for remote management over ssh'
+        'qemu'
+        'radvd'
+        'dmidecode'
+        'pm-utils: host power management')
 conflicts=('libvirt')
 provides=('libvirt')
 options=('emptydirs')
 backup=('etc/conf.d/libvirt-guests'
-	'etc/conf.d/libvirtd'
-	'etc/libvirt/libvirt.conf'
-	'etc/libvirt/virtlogd.conf'
-	'etc/libvirt/libvirtd.conf'
-	'etc/libvirt/lxc.conf'
-	'etc/libvirt/nwfilter/allow-arp.xml'
-	'etc/libvirt/nwfilter/allow-dhcp-server.xml'
-	'etc/libvirt/nwfilter/allow-dhcp.xml'
-	'etc/libvirt/nwfilter/allow-incoming-ipv4.xml'
-	'etc/libvirt/nwfilter/allow-ipv4.xml'
-	'etc/libvirt/nwfilter/clean-traffic.xml'
-	'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml'
-	'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml'
-	'etc/libvirt/nwfilter/no-arp-spoofing.xml'
-	'etc/libvirt/nwfilter/no-ip-multicast.xml'
-	'etc/libvirt/nwfilter/no-ip-spoofing.xml'
-	'etc/libvirt/nwfilter/no-mac-broadcast.xml'
-	'etc/libvirt/nwfilter/no-mac-spoofing.xml'
-	'etc/libvirt/nwfilter/no-other-l2-traffic.xml'
-	'etc/libvirt/nwfilter/no-other-rarp-traffic.xml'
-	'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml'
-	'etc/libvirt/nwfilter/qemu-announce-self.xml'
-	'etc/libvirt/qemu-lockd.conf'
-	'etc/libvirt/qemu.conf'
-	'etc/libvirt/qemu/networks/autostart/default.xml'
-	'etc/libvirt/qemu/networks/default.xml'
-	'etc/libvirt/virt-login-shell.conf'
-	'etc/libvirt/virtlockd.conf'
-	'etc/logrotate.d/libvirtd'
-	'etc/logrotate.d/libvirtd.lxc'
-	'etc/logrotate.d/libvirtd.qemu'
-	'etc/logrotate.d/libvirtd.uml'
-	'etc/sasl2/libvirt.conf')
+    'etc/conf.d/libvirtd'
+    'etc/libvirt/libvirt.conf'
+    'etc/libvirt/virtlogd.conf'
+    'etc/libvirt/libvirtd.conf'
+    'etc/libvirt/lxc.conf'
+    'etc/libvirt/nwfilter/allow-arp.xml'
+    'etc/libvirt/nwfilter/allow-dhcp-server.xml'
+    'etc/libvirt/nwfilter/allow-dhcp.xml'
+    'etc/libvirt/nwfilter/allow-incoming-ipv4.xml'
+    'etc/libvirt/nwfilter/allow-ipv4.xml'
+    'etc/libvirt/nwfilter/clean-traffic.xml'
+    'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml'
+    'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml'
+    'etc/libvirt/nwfilter/no-arp-spoofing.xml'
+    'etc/libvirt/nwfilter/no-ip-multicast.xml'
+    'etc/libvirt/nwfilter/no-ip-spoofing.xml'
+    'etc/libvirt/nwfilter/no-mac-broadcast.xml'
+    'etc/libvirt/nwfilter/no-mac-spoofing.xml'
+    'etc/libvirt/nwfilter/no-other-l2-traffic.xml'
+    'etc/libvirt/nwfilter/no-other-rarp-traffic.xml'
+    'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml'
+    'etc/libvirt/nwfilter/qemu-announce-self.xml'
+    'etc/libvirt/qemu-lockd.conf'
+    'etc/libvirt/qemu.conf'
+    'etc/libvirt/qemu/networks/autostart/default.xml'
+    'etc/libvirt/qemu/networks/default.xml'
+    'etc/libvirt/virt-login-shell.conf'
+    'etc/libvirt/virtlockd.conf'
+    'etc/logrotate.d/libvirtd'
+    'etc/logrotate.d/libvirtd.lxc'
+    'etc/logrotate.d/libvirtd.qemu'
+    'etc/logrotate.d/libvirtd.uml'
+    'etc/sasl2/libvirt.conf')
 install="libvirt.install"
 source=('git+git://libvirt.org/libvirt.git'
-	libvirtd.conf.d
-	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d)
+    libvirtd.conf.d
+    libvirtd-guests.conf.d
+    libvirt.tmpfiles.d)
 md5sums=('SKIP'
-	 '5e31269067dbd12ca871234450bb66bb'
-	 '384fff96c6248d4f020f6fa66c32b357'
-	 '020971887442ebbf1b6949e031c8dd3f')	 
+     '5e31269067dbd12ca871234450bb66bb'
+     '384fff96c6248d4f020f6fa66c32b357'
+     '020971887442ebbf1b6949e031c8dd3f')     
 pkgver() {
   cd "$SRCDEST/${pkgname/-git/}"
   git describe --always | sed 's|-|.|g' | sed 's/^.//'
@@ -106,17 +107,18 @@ build() {
   export RADVD=/usr/bin/radvd
   NOCONFIGURE=1 ./autogen.sh
   sed -i 's|libsystemd-daemon|libsystemd|g' configure
-  
-  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin \
-	--with-storage-lvm --with-udev --without-hal --disable-static \
-	--with-init-script=systemd \
-	--with-qemu-user=nobody --with-qemu-group=nobody \
-	--with-netcf --with-interface
+  mkdir build && cd build
+
+  [ -f Makefile ] || ../configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin \
+    --with-storage-lvm --with-udev --without-hal --disable-static \
+    --with-init-script=systemd \
+    --with-qemu-user=nobody --with-qemu-group=nobody \
+    --with-netcf --with-interface
   make
 }
 
 package() {
-  cd "$srcdir/${pkgname/-git/}"
+  cd "$srcdir/${pkgname/-git/}/build"
 
   make DESTDIR="$pkgdir" install
 
@@ -131,7 +133,7 @@ package() {
   chmod 0750 "$pkgdir"/usr/share/polkit-1/rules.d
 
   rm -rf \
-	"$pkgdir"/var/run \
-	"$pkgdir"/etc/sysconfig \
-	"$pkgdir"/etc/rc.d
+    "$pkgdir"/var/run \
+    "$pkgdir"/etc/sysconfig \
+    "$pkgdir"/etc/rc.d
 }