Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at Fri Jul 29 10:00:11 CEST 2011. -------- --- virt-viewer/virt-viewer.changes 2011-05-12 18:10:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-viewer/virt-viewer.changes 2011-07-28 20:51:00.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Jul 28 12:42:52 MDT 2011 - carnold@novell.com + +- Fixed error "Using GTK+ 2.x and GTK+ 3 in the same process is + not supported" + +------------------------------------------------------------------- +Tue Jul 12 11:19:11 MDT 2011 - carnold@novell.com + +- Fixed spec file rpmlint warnings for language files. +- Patch cleanup and re-enabled vnc-listen.patch + +------------------------------------------------------------------- +Mon Jul 11 10:04:06 MDT 2011 - carnold@novell.com + +- Fix re-connect after authentication failure + virtview-reconnect-fix.patch + +------------------------------------------------------------------- +Tue Jul 5 13:29:51 MDT 2011 - carnold@novell.com + +- Fix "directories not owned by a package:" warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- keymap.diff New: ---- virtview-reconnect-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.vfY2vw/_old 2011-07-29 09:56:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vfY2vw/_new 2011-07-29 09:56:57.000000000 +0200 @@ -19,24 +19,28 @@ Name: virt-viewer Version: 0.3.1 -Release: 3 +Release: 5 Summary: Virtual Machine Viewer Group: System/Monitoring License: GPLv2+ Url: http://www.virt-manager.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: virt-viewer-0.3.1.tar.gz -Patch0: netcat.diff -Patch1: vnc-listen.patch -Patch2: windows-keycombo.patch -Patch3: netware-keycombo.patch -Patch4: glade-keycombo.patch -Patch5: keymap.diff -Patch6: report-error.patch +Patch0: virtview-reconnect-fix.patch +Patch10: netcat.diff +Patch11: vnc-listen.patch +Patch12: windows-keycombo.patch +Patch13: netware-keycombo.patch +Patch14: glade-keycombo.patch +Patch15: report-error.patch BuildRequires: gtk2-devel BuildRequires: libvirt-devel >= 0.6.0 BuildRequires: libxml2-devel +%if %suse_version > 1140 +BuildRequires: gtk-vnc2-devel +%else BuildRequires: gtk-vnc-devel >= 0.3.8 +%endif BuildRequires: libglade2-devel %if %suse_version > 1130 BuildRequires: libpixman-1-0-devel @@ -44,7 +48,7 @@ BuildRequires: libpixman %endif BuildRequires: intltool -#our build requirements +# Our build requirements BuildRequires: xen-devel Requires: netcat ExclusiveArch: %ix86 x86_64 @@ -63,37 +67,32 @@ %prep %setup -q %patch0 -p1 -#%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -#%patch5 -p1 -%patch6 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %build -# Note: remote GTKVNC_CFLAGS and GTKVNC_LIBS when gtk-vnc.pc is fixed in STABLE -%if %suse_version > 1140 -%configure GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-2.0 GTKVNC_LIBS=-lgtk-vnc-2.0 -%else %configure GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-1.0 GTKVNC_LIBS=-lgtk-vnc-1.0 -%endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%{find_lang} %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog %{_bindir}/%{name} %{_mandir}/man1/%{name}* %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/ui -%dir %{_datadir}/locale/*/*/*.mo /usr/share/virt-viewer/ui/about.glade /usr/share/virt-viewer/ui/auth.glade /usr/share/virt-viewer/ui/viewer.glade ++++++ report-error.patch ++++++ --- /var/tmp/diff_new_pack.vfY2vw/_old 2011-07-29 09:56:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vfY2vw/_new 2011-07-29 09:56:57.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-viewer-0.3.1.orig/src/viewer.c +++ virt-viewer-0.3.1/src/viewer.c -@@ -1105,6 +1105,7 @@ static int viewer_initial_connect(VirtVi +@@ -1118,6 +1118,7 @@ static int viewer_initial_connect(VirtVi } else { viewer_simple_message_dialog(viewer->window, _("Cannot find guest domain %s"), viewer->domkey); ++++++ virtview-reconnect-fix.patch ++++++ Subject: Fix re-connect after authentication failure From: Daniel P. Berrange berrange@redhat.com Mon May 23 12:41:12 2011 +0100 Date: Mon May 23 12:41:12 2011 +0100: Git: 6234a2e1f4f904a8ed8f625a7d8fe1705fe5478a viewer->display will be non-NULL if we have already attempted a connection. So, remove the check for it being NULL, and instead skip the widget setup step. Index: virt-viewer-0.3.1/src/viewer.c =================================================================== --- virt-viewer-0.3.1.orig/src/viewer.c +++ virt-viewer-0.3.1/src/viewer.c @@ -899,18 +899,18 @@ static int viewer_activate(VirtViewer *v int fd = -1; int ret = -1; - g_return_val_if_fail(viewer->display == NULL, -1); - if (viewer->active) goto cleanup; - if (!viewer_extract_connect_info(viewer, dom)) - goto cleanup; + if (viewer->display == NULL) { + if (!viewer_extract_connect_info(viewer, dom)) + goto cleanup; - if (viewer->gport) - viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->gport); - else - viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->unixsock); + if (viewer->gport) + viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->gport); + else + viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->unixsock); + } #if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK) if (viewer->transport && ++++++ vnc-listen.patch ++++++ --- /var/tmp/diff_new_pack.vfY2vw/_old 2011-07-29 09:56:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vfY2vw/_new 2011-07-29 09:56:57.000000000 +0200 @@ -1,67 +1,39 @@ -Index: virt-viewer-0.2.1/src/viewer.c +Index: virt-viewer-0.3.1/src/viewer.c =================================================================== ---- virt-viewer-0.2.1.orig/src/viewer.c -+++ virt-viewer-0.2.1/src/viewer.c -@@ -696,7 +696,7 @@ static int viewer_matches_domain(VirtVie - return 0; - } - --static char * viewer_extract_vnc_port(virDomainPtr dom) -+static char * viewer_extract_vnc_port(virDomainPtr dom, char **host) +--- virt-viewer-0.3.1.orig/src/viewer.c ++++ virt-viewer-0.3.1/src/viewer.c +@@ -896,12 +896,25 @@ void viewer_channel_open_fd(VirtViewer * + static int viewer_activate(VirtViewer *viewer, + virDomainPtr dom) { - char *xmldesc = virDomainGetXMLDesc(dom, 0); - xmlDocPtr xml = NULL; -@@ -709,6 +709,14 @@ static char * viewer_extract_vnc_port(vi - if (!pctxt || !pctxt->sax) - goto error; ++ xmlXPathContextPtr ctxt = NULL; ++ xmlXPathObjectPtr obj = NULL; ++ char *vnchost = NULL; + int fd = -1; + int ret = -1; + + if (viewer->active) + goto cleanup; + obj = xmlXPathEval((const xmlChar *)"string(/domain/devices/graphics[@type='vnc']/@listen)", ctxt); + if (obj && obj->type == XPATH_STRING && + obj->stringval && obj->stringval[0]) { -+ *host = strdup((const char*)obj->stringval); ++ vnchost = strdup((const char*)obj->stringval); + xmlXPathFreeObject(obj); + obj = NULL; + } -+ - xml = xmlCtxtReadDoc(pctxt, (const xmlChar *)xmldesc, "domain.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); -@@ -868,15 +876,18 @@ static int viewer_activate(VirtViewer *v - char *host = NULL; - char *transport = NULL; - char *user = NULL; -+ char *vnchost = NULL; - int port, fd = -1; - int ret = -1; - - if (viewer->active) - goto cleanup; - -- if ((vncport = viewer_extract_vnc_port(dom)) == NULL) { -+ if ((vncport = viewer_extract_vnc_port(dom, &vnchost)) == NULL) { - viewer_simple_message_dialog(viewer->window, _("Cannot determine the VNC port for the guest %s"), - viewer->domkey); -+ free(vnchost); -+ vnchost = NULL; - goto cleanup; - } - -@@ -886,6 +897,9 @@ static int viewer_activate(VirtViewer *v - goto cleanup; - } - + if (vnchost == NULL) + vnchost = strdup("127.0.0.1"); + - DEBUG_LOG("Remote host is %s and transport %s user %s", - host, transport ? transport : "", user ? user : ""); - -@@ -901,7 +915,7 @@ static int viewer_activate(VirtViewer *v - if (fd >= 0) { - vnc_display_open_fd(VNC_DISPLAY(viewer->vnc), fd); + if (viewer->display == NULL) { + if (!viewer_extract_connect_info(viewer, dom)) + goto cleanup; +@@ -935,7 +948,7 @@ static int viewer_activate(VirtViewer *v } else { -- vnc_display_open_host(VNC_DISPLAY(viewer->vnc), host, vncport); -+ vnc_display_open_host(VNC_DISPLAY(viewer->vnc), vnchost, vncport); + DEBUG_LOG("Connecting to TCP socket %s:%s", viewer->host, viewer->gport); + ret = virt_viewer_display_open_host(viewer->display, +- viewer->host, viewer->gport); ++ vnchost, viewer->gport); } - viewer_set_status(viewer, "Connecting to VNC server"); + viewer_set_status(viewer, "Connecting to graphic server"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org