From 0b6eb25d5f8ab9625863d79911f01754e948b1fb Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 13 Feb 2013 16:33:29 +0000
Subject: [PATCH] Update to 0.5.5 release

---
 sources          |  1 +
 virt-viewer.spec | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/sources b/sources
index 89218f2..7b3baba 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 43c269da571e65b12421b6fc9f871e98  virt-viewer-0.5.4.tar.gz
+a5516d33a29df5d135611c4667c03f77  virt-viewer-0.5.5.tar.gz
diff --git a/virt-viewer.spec b/virt-viewer.spec
index 69af33f..94628e4 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -1,5 +1,10 @@
 # -*- rpm-spec -*-
 
+# Default to skipping autoreconf.  Distros can change just this one line
+# (or provide a command-line override) if they backport any patches that
+# 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}
@@ -24,15 +29,13 @@
 %endif
 
 Name: virt-viewer
-Version: 0.5.4
-Release: 3%{?dist}%{?extra_release}
+Version: 0.5.5
+Release: 1%{?dist}%{?extra_release}
 Summary: Virtual Machine Viewer
 Group: Applications/System
 License: GPLv2+
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
-# Fix crash after entering spice password (bz 880381)
-Patch1: 0001-Don-t-free-SPICE-ticket-twice.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: openssh-clients
 Requires(post):   %{_sbindir}/update-alternatives
@@ -40,6 +43,13 @@ Requires(postun): %{_sbindir}/update-alternatives
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
+%if 0%{?enable_autotools}
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gettext-devel
+BuildRequires: libtool
+%endif
+
 BuildRequires: glib2-devel >= 2.22
 %if %{with_gtk3}
 BuildRequires: gtk3-devel >= 3.0.0
@@ -55,9 +65,9 @@ BuildRequires: gtk-vnc-devel >= 0.3.8
 %endif
 %if %{with_spice}
 %if %{with_gtk3}
-BuildRequires: spice-gtk3-devel >= 0.12.101
+BuildRequires: spice-gtk3-devel >= 0.16.26
 %else
-BuildRequires: spice-gtk-devel >= 0.12.101
+BuildRequires: spice-gtk-devel >= 0.16.26
 %endif
 BuildRequires: spice-protocol >= 0.10.1
 %endif
@@ -93,10 +103,13 @@ browsers.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
+%if 0%{?enable_autotools}
+autoreconf -if
+%endif
+
 %if %{_with_plugin}
 %define plugin_arg --enable-plugin
 %else
@@ -115,7 +128,7 @@ browsers.
 %define gtk_arg --with-gtk=2.0
 %endif
 
-%configure %{spice_arg} %{plugin_arg} %{gtk_arg}
+%configure %{spice_arg} %{plugin_arg} %{gtk_arg} --with-buildid=-%{release}
 %__make %{?_smp_mflags}
 
 
@@ -163,6 +176,7 @@ update-desktop-database -q %{_datadir}/applications
 %{_datadir}/%{name}/ui/virt-viewer-about.xml
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/applications/remote-viewer.desktop
+%{_datadir}/mime/packages/virt-viewer-mime.xml
 %ghost %{_libexecdir}/spice-xpi-client
 %{_libexecdir}/spice-xpi-client-remote-viewer
 %{_mandir}/man1/virt-viewer.1*