diff --git a/0001-Don-t-free-SPICE-ticket-twice.patch b/0001-Don-t-free-SPICE-ticket-twice.patch deleted file mode 100644 index 9132592..0000000 --- a/0001-Don-t-free-SPICE-ticket-twice.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a4e588e3eacf4e5590ff98171a495f8fa0e37375 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Christophe Fergeau -Date: Mon, 1 Oct 2012 18:22:04 +0200 -Subject: [PATCH] Don't free SPICE ticket twice - -Commit 2201a5a was supposed to free a SPICE ticket leak, but it's -actually introducing a double-free as the SPICE ticket is -unconditionally freed at the end of -virt_viewer_session_spice_main_channel_event ---- - src/virt-viewer-session-spice.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c -index 5fcd7fb..2577f2b 100644 ---- a/src/virt-viewer-session-spice.c -+++ b/src/virt-viewer-session-spice.c -@@ -326,7 +326,6 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED - gboolean openfd; - - g_object_set(self->priv->session, "password", password, NULL); -- g_free(password); - g_object_get(self->priv->session, "client-sockets", &openfd, NULL); - - if (openfd) --- -1.8.0.2 - diff --git a/sources b/sources index 0aaf7d6..a5f0206 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5516d33a29df5d135611c4667c03f77 virt-viewer-0.5.5.tar.gz +b1f55ad642df062028b24d8a77619ac5 virt-viewer-0.5.6.tar.gz diff --git a/virt-viewer.spec b/virt-viewer.spec index 1ac4c24..f722bf8 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -5,10 +5,6 @@ # touch configure.ac or Makefile.am. %{!?enable_autotools:%define enable_autotools 0} -# Plugin isn't ready for real world use yet - it needs -# a security audit at very least -%define _with_plugin %{?with_plugin:1}%{!?with_plugin:0} - %define with_gtk3 0 %if 0%{?fedora} >= 15 %define with_gtk3 1 @@ -19,6 +15,11 @@ %define with_spice 1 %endif +%define with_govirt 0 +%if 0%{?fedora} >= 19 +%define with_govirt 1 +%endif + %if 0%{?rhel} >= 6 %define with_spice 1 %endif @@ -29,7 +30,7 @@ %endif Name: virt-viewer -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System @@ -73,12 +74,8 @@ BuildRequires: spice-protocol >= 0.10.1 %endif BuildRequires: /usr/bin/pod2man BuildRequires: intltool -%if %{_with_plugin} -%if 0%{?fedora} > 8 -BuildRequires: xulrunner-devel -%else -BuildRequires: firefox-devel -%endif +%if %{with_govirt} +BuildRequires: libgovirt-devel >= 0.0.3 %endif %description @@ -86,21 +83,6 @@ Virtual Machine Viewer provides a graphical console client for connecting to virtual machines. It uses the GTK-VNC or SPICE-GTK widgets to provide the display, and libvirt for looking up VNC/SPICE server details. -%if %{_with_plugin} -%package plugin -Summary: Mozilla plugin for the gtk-vnc library -Group: Development/Libraries -Requires: %{name} = %{version} - -%description plugin -Virtual Machine Viewer provides a graphical console client for connecting -to virtual machines. It uses the GTK-VNC or SPICE-GTK widgets to provide -the display, and libvirt for looking up VNC/SPICE server details. - -This package provides a web browser plugin for Mozilla compatible -browsers. -%endif - %prep %setup -q @@ -110,12 +92,6 @@ browsers. autoreconf -if %endif -%if %{_with_plugin} -%define plugin_arg --enable-plugin -%else -%define plugin_arg --disable-plugin -%endif - %if %{with_spice} %define spice_arg --with-spice-gtk %else @@ -128,7 +104,11 @@ autoreconf -if %define gtk_arg --with-gtk=2.0 %endif -%configure %{spice_arg} %{plugin_arg} %{gtk_arg} --with-buildid=-%{release} +%if %{with_govirt} +%define govirt_arg --with-ovirt +%endif + +%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=-%{release} %__make %{?_smp_mflags} @@ -138,10 +118,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{_libexecdir} touch %{buildroot}%{_libexecdir}/spice-xpi-client install -m 0755 data/spice-xpi-client-remote-viewer %{buildroot}%{_libexecdir}/ -%if %{_with_plugin} -rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a -rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la -%endif %find_lang %{name} %clean @@ -182,13 +158,10 @@ update-desktop-database -q %{_datadir}/applications %{_mandir}/man1/virt-viewer.1* %{_mandir}/man1/remote-viewer.1* -%if %{_with_plugin} -%files plugin -%defattr(-, root, root) -%{_libdir}/mozilla/plugins/%{name}-plugin.so -%endif - %changelog +* Wed May 1 2013 Daniel P. Berrange - 0.5.6-1 +- Update to 0.5.6 release + * Wed Feb 13 2013 Daniel P. Berrange - 0.5.5-1 - Update to 0.5.5 release