[arch-commits] Commit in virt-manager/trunk (3 files)

[Sergej Pupykin]

    Date: Wednesday, July 3, 2013 @ 13:37:57
  Author: spupykin
Revision: 93415

upgpkg: virt-manager 0.10.0-1

upd

Modified:
  virt-manager/trunk/PKGBUILD
  virt-manager/trunk/virt-manager.install
Deleted:
  virt-manager/trunk/openbsd-netcat-default.patch

------------------------------+
 PKGBUILD                     |   47 +++++++++++------------------------------
 openbsd-netcat-default.patch |   30 --------------------------
 virt-manager.install         |    4 ---
 3 files changed, 13 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-03 11:37:53 UTC (rev 93414)
+++ PKGBUILD	2013-07-03 11:37:57 UTC (rev 93415)
@@ -3,57 +3,36 @@
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virt-manager
-pkgver=0.9.5
+pkgver=0.10.0
 pkgrel=1
 pkgdesc="Desktop user interface for managing virtual machines"
 arch=('any')
 url="http://virt-manager.et.redhat.com"
 license=('GPL')
-depends=('dbus-python' 'libvirt' 'libxml2' 'vte' 'virtinst' 'gtk-vnc' 'rarian'
+depends=('dbus-python' 'libvirt' 'libxml2' 'vte' 'gtk-vnc' 'rarian'
          'gconf' 'yajl' 'librsvg' 'python2' 'python2-gconf' 'libuser'
          'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass'
          'hicolor-icon-theme' 'graphite')
 makedepends=('gnome-doc-utils' 'intltool>=0.35.0')
-
-# When executables that comes with the package crash, are deps optional?
-# It may be a matter of taste, but we got at least one crash bug report.
-#optdepends=('x11-ssh-askpass: for ssh authentication to remote servers'
-#	    'libuser: for virt-manager-tui'
-#	    'python2-ipy: for virt-manager-tui'
-#	    'newt-syrup: for virt-manager-tui'
-#	    'openbsd-netcat: for remote server access')
-
+conflicts=('virtinst')
+replaces=('virtinst')
 install=virt-manager.install
-source=("http://virt-manager.et.redhat.com/download/sources/$pkgname/$pkgname-$pkgver.tar.gz"
-        "openbsd-netcat-default.patch")
-md5sums=('2b622a0f4cd53f83665d9841b5a3cefa'
-         '76d5a0d6c3bf60e98df3ffe76248745e')
+source=("http://virt-manager.et.redhat.com/download/sources/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('e23b8d2a7623b4e8e256c25735f332c8')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  export LDFLAGS=-lX11
-  sed -i 's#python#python2#' src/virt-manager.in src/virt-manager-tui.in
-#  patch -p1 < "$srcdir/openbsd-netcat-default.patch"
-  [ -f install-sh ] || automake --add-missing || true
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexec="/usr/lib/$pkgname" \
-	--localstatedir=/var
-  make
+  sed -i 's#bin/python#bin/python2#' virt-*
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  python2 setup.py install --root "$pkgdir"
   # Set-up schema file in correct location
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema \
-	"$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
-	"$pkgdir/etc/gconf/schemas/"*.schemas
-  rm -rf "$pkgdir/etc/gconf/schemas"
-  rmdir --ignore-fail-on-non-empty "$pkgdir/etc/gconf" "$pkgdir/etc"
+#  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+#  gconf-merge-schema \
+#	"$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
+#	"$pkgdir/etc/gconf/schemas/"*.schemas
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: openbsd-netcat-default.patch
===================================================================
--- openbsd-netcat-default.patch	2013-07-03 11:37:53 UTC (rev 93414)
+++ openbsd-netcat-default.patch	2013-07-03 11:37:57 UTC (rev 93415)
@@ -1,30 +0,0 @@
-diff -wbBur virt-manager-0.9.2/src/virtManager/console.py virt-manager-0.9.2.my/src/virtManager/console.py
---- virt-manager-0.9.2/src/virtManager/console.py	2012-07-09 16:09:02.000000000 +0400
-+++ virt-manager-0.9.2.my/src/virtManager/console.py	2012-07-12 12:52:26.000000000 +0400
-@@ -140,11 +140,11 @@
-             nc_params = "%s %s" % (ginfo.gaddr, ginfo.gport)
- 
-         nc_cmd = (
--            """nc -q 2>&1 | grep "requires an argument" >/dev/null;"""
-+            """nc.openbsd -q 2>&1 | grep "requires an argument" >/dev/null;"""
-             """if [ $? -eq 0 ] ; then"""
--            """   CMD="nc -q 0 %(nc_params)s";"""
-+            """   CMD="nc.openbsd -q 0 %(nc_params)s";"""
-             """else"""
--            """   CMD="nc %(nc_params)s";"""
-+            """   CMD="nc.openbsd %(nc_params)s";"""
-             """fi;"""
-             """eval "$CMD";""" %
-             {'nc_params': nc_params})
-diff -wbBur virt-manager-0.9.2/src/virtManager/manager.py virt-manager-0.9.2.my/src/virtManager/manager.py
---- virt-manager-0.9.2/src/virtManager/manager.py	2012-07-09 16:09:02.000000000 +0400
-+++ virt-manager-0.9.2.my/src/virtManager/manager.py	2012-07-12 12:52:17.000000000 +0400
-@@ -653,7 +653,7 @@
- 
-         if conn.is_remote():
-             logging.debug(conn.get_transport())
--            if re.search(r"nc: .* -- 'U'", tb):
-+            if re.search(r"nc.openbsd: .* -- 'U'", tb):
-                 hint += _("The remote host requires a version of netcat/nc\n"
-                           "which supports the -U option.")
-                 show_errmsg = False

Modified: virt-manager.install
===================================================================
--- virt-manager.install	2013-07-03 11:37:53 UTC (rev 93414)
+++ virt-manager.install	2013-07-03 11:37:57 UTC (rev 93415)
@@ -1,11 +1,9 @@
 pkgname=virt-manager
 
 post_install() {
-	rm -f /usr/share/virt-manager/virtManager/*.pyc
 	usr/sbin/gconfpkg --install $pkgname
 	[ -x usr/bin/update-desktop-database ] && update-desktop-database -q
 	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	/bin/true
 }
 
 pre_upgrade() {
@@ -19,11 +17,9 @@
 pre_remove() {
 	rm -f /usr/share/virt-manager/virtManager/*.pyc
 	usr/sbin/gconfpkg --uninstall $pkgname
-	/bin/true
 }
 
 post_remove() {
 	[ -x usr/bin/update-desktop-database ] && update-desktop-database -q
 	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	/bin/true
 }