updated PKGBUILD, removed .install file

3 files changed, 13 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 416f8c0bc6a1..dd6ea6b07003 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = virt-manager-git
 	pkgdesc = Console user interface for managing virtual machines
-	pkgver = 1.3.0.r4772.7ef1713
+	pkgver = 1.3.2.r4899.09cc6f3
 	pkgrel = 1
 	url = http://virt-manager.org/
 	arch = any
@@ -14,6 +14,7 @@ pkgbase = virt-manager-git
 	makedepends = librsvg
 	makedepends = python2-gconf
 	makedepends = libuser
+	makedepends = python2-cairo
 	makedepends = python2-ipy
 	makedepends = newt-syrup
 	makedepends = openbsd-netcat
@@ -39,7 +40,6 @@ pkgname = virt-install-git
 	conflicts = virt-install
 
 pkgname = virt-manager-git
-	install = virt-manager.install
 	depends = virt-install-git
 	depends = python2
 	depends = libvirt-python
@@ -49,11 +49,10 @@ pkgname = virt-manager-git
 	depends = dbus-python
 	depends = gtk-vnc
 	depends = rarian
-	depends = gconf
 	depends = yajl
 	depends = librsvg
-	depends = python2-gconf
 	depends = libuser
+	depends = python2-cairo
 	depends = python2-ipy
 	depends = newt-syrup
 	depends = openbsd-netcat
diff --git a/PKGBUILD b/PKGBUILD
index 041e74d2a99e..517f971c8fb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=virt-manager-git
 _pkgbase=virt-manager
 pkgname=(virt-install-git virt-manager-git)
-pkgver=1.3.0.r4772.7ef1713
+pkgver=1.3.2.r4899.09cc6f3
 pkgrel=1
 pkgdesc="Console user interface for managing virtual machines"
 arch=('any')
@@ -23,7 +23,7 @@ depends=('python2' 'libvirt-python' 'libxml2' 'libvirt'
 	 'libosinfo' 'python2-ipaddr' 'python2-gobject' 'python2-requests')
 makedepends=('intltool>=0.35.0'
 	     'dbus-python' 'gtk-vnc' 'rarian'
-	     'gconf' 'yajl' 'librsvg' 'python2-gconf' 'libuser'
+	     'gconf' 'yajl' 'librsvg' 'python2-gconf' 'libuser' 'python2-cairo'
 	     'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass'
 	     'graphite' 'spice-gtk3'
 	     'libvirt-glib' 'vte3' 'git')
@@ -43,19 +43,24 @@ build() {
 package_virt-install-git() {
   conflicts=('virt-install')
   provides=('virt-install')
+
   cd "$srcdir/$_pkgbase"
-  python2 setup.py install --root "$pkgdir"
+  python2 setup.py --no-update-icon-cache --no-compile-schemas install --root "$pkgdir"
+  python2 -m compileall "${pkgdir}/usr/share/virt-manager"
+  python2 -O -m compileall "${pkgdir}/usr/share/virt-manager"
+  rm "${pkgdir}/usr/bin/virt-manager"
 }
 
 package_virt-manager-git() {
   conflicts=('virt-manager')
   provides=('virt-manager')
-  install=virt-manager.install
   depends=('virt-install-git'
 	    'python2' 'libvirt-python' 'libxml2' 'libvirt' 'python2-requests'
 	    'dbus-python' 'gtk-vnc' 'rarian'
-	    'gconf' 'yajl' 'librsvg' 'python2-gconf' 'libuser'
+	    'yajl' 'librsvg' 'libuser' 'python2-cairo'
 	    'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass'
 	    'graphite' 'spice-gtk3'
 	    'libvirt-glib' 'vte3')
+  cd "$srcdir/$_pkgbase"
+  install -Dm 755 build/virt-manager -t "${pkgdir}/usr/bin"
 }
diff --git a/virt-manager.install b/virt-manager.install
deleted file mode 100644
index 642819868d81..000000000000
--- a/virt-manager.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-	[ -x usr/bin/update-desktop-database ] && update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	rm -f /usr/share/virt-manager/virtManager/*.pyc || true
-}
-
-post_remove() {
-	[ -x usr/bin/update-desktop-database ] && update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	glib-compile-schemas usr/share/glib-2.0/schemas
-}