[virt-viewer] Update to 0.5.6 release

Daniel P. Berrange berrange at fedoraproject.org
Wed May 1 16:38:19 UTC 2013


commit 1f6acc8482dbe4ca69e0347a89791e51e3ed0ba2
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Wed May 1 17:37:44 2013 +0100

    Update to 0.5.6 release

 0001-Don-t-free-SPICE-ticket-twice.patch |   29 ---------------
 sources                                  |    2 +-
 virt-viewer.spec                         |   59 ++++++++----------------------
 3 files changed, 17 insertions(+), 73 deletions(-)
---
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 <berrange at redhat.com> - 0.5.6-1
+- Update to 0.5.6 release
+
 * Wed Feb 13 2013 Daniel P. Berrange <berrange at redhat.com> - 0.5.5-1
 - Update to 0.5.5 release
 


More information about the scm-commits mailing list