Fixed various packaging bugs

autobuild.sh

@@ -29,6 +29,6 @@ if [ -f /usr/bin/rpmbuild ]; then
     NOW=`date +"%s"`
     EXTRA_RELEASE=".$USER$NOW"
   fi
-  rpmbuild --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
+  rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
 fi
 

configure.ac

@@ -1,8 +1,9 @@
 AC_INIT(gnome-virt-manager.spec.in)
-AM_INIT_AUTOMAKE(gnome-virt-manager, 0.0.2)
+AM_INIT_AUTOMAKE(gnome-virt-manager, 0.1.0)
 
 AC_OUTPUT(Makefile
           src/Makefile
           src/virtManager/Makefile
+          src/vncViewer/Makefile
           pixmaps/Makefile
           gnome-virt-manager.spec)

gnome-virt-manager.spec.in

@@ -9,15 +9,22 @@ Summary: GNOME Virtual Machine Manager
 
 Group: Applications/Emulators
 License: GPL v2+
-URL: http://harp.boston.redhat.com/olpcdev/tools/qemu-admin
+URL: http://harp.boston.redhat.com/virtdev/applications/gnome-virt-manager
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: python
 Requires: pygtk2 >= 1.99.12-6
 Requires: gnome-python2-gconf >= 1.99.11-7
-Requires: libvirt-python >= 0.1.0
+Requires: libvirt-python >= 0.1.1
+Requires: dbus-python >= 0.61
+
 Requires: python-matplotlib
+# src/vncViewer/image.py needs either this
+Requires: python-imaging
+# Or this
+Requires: pygame
+# But not both!
 
 BuildArchitectures: noarch
 
@@ -49,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/dbus-1/services/%{name}.service
 
 %changelog
+* Fri Jun 16 2006 Daniel Berrange <berrange@redhat.com> - 0.1.0-1
+- Added initial support for using VNC console
+
 * Thu Apr 20 2006 Daniel Berrange <berrange@redhat.com> - 0.0.2-1
 - Added DBus remote control service
 

src/Makefile.am

@@ -1,5 +1,5 @@
 
-SUBDIRS = virtManager
+SUBDIRS = virtManager vncViewer
 
 bin_SOURCES = gnome-virt-manager.in
 bin_SCRIPTS = gnome-virt-manager

src/vncViewer/Makefile.am

@@ -0,0 +1,5 @@
+
+pythondir = $(pkgdatadir)/vncViewer
+python_DATA = $(wildcard $(srcdir)/*.py)
+
+EXTRA_DIST = $(python_DATA)