From 926a661a8eb338b91a3fcdcdeee502258016385a Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 30 Jun 2016 15:19:24 +0100
Subject: [PATCH] Update to virt-viewer 4.0 release

---
 sources          |  2 +-
 virt-viewer.spec | 57 +++++++++++++-----------------------------------
 2 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/sources b/sources
index 3c0c5ae..bf55c68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f36b1b85da943eba7ad72fd93ba63435  virt-viewer-3.0.tar.gz
+d92d09ba29413c4aa0498e7cccf4eea2  virt-viewer-4.0.tar.gz
diff --git a/virt-viewer.spec b/virt-viewer.spec
index 7142136..a9031d3 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -5,11 +5,6 @@
 # touch configure.ac or Makefile.am.
 %{!?enable_autotools:%define enable_autotools 0}
 
-%define with_gtk3 0
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%define with_gtk3 1
-%endif
-
 %define with_spice 0
 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
 %define with_spice 1
@@ -21,8 +16,8 @@
 %endif
 
 Name: virt-viewer
-Version: 3.0
-Release: 3%{?dist}%{?extra_release}
+Version: 4.0
+Release: 1%{?dist}%{?extra_release}
 Summary: Virtual Machine Viewer
 Group: Applications/System
 License: GPLv2+
@@ -42,31 +37,20 @@ BuildRequires: gettext-devel
 BuildRequires: libtool
 %endif
 
-BuildRequires: glib2-devel >= 2.22.0
-%if %{with_gtk3}
-BuildRequires: gtk3-devel >= 3.0
-%else
-BuildRequires: gtk2-devel >= 2.18.0
-%endif
-BuildRequires: libvirt-devel >= 0.10.0
-BuildRequires: libxml2-devel >= 2.6.0
-%if %{with_gtk3}
-BuildRequires: gtk-vnc2-devel >= 0.4.0
-%else
-BuildRequires: gtk-vnc-devel >= 0.3.8
-%endif
+BuildRequires: pkgconfig(glib-2.0) >= 2.38
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
+BuildRequires: pkgconfig(libvirt) >= 0.10.0
+BuildRequires: pkgconfig(libvirt-glib-1.0) >= 0.1.8
+BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0
+BuildRequires: pkgconfig(gtk-vnc-2.0) >= 0.4.0
 %if %{with_spice}
-%if %{with_gtk3}
-BuildRequires: spice-gtk3-devel >= 0.32
-%else
-BuildRequires: spice-gtk-devel >= 0.30
-%endif
-BuildRequires: spice-protocol >= 0.12.7
+BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.31
+BuildRequires: pkgconfig(spice-protocol) >= 0.12.7
 %endif
 BuildRequires: /usr/bin/pod2man
 BuildRequires: intltool
 %if %{with_govirt}
-BuildRequires: libgovirt-devel >= 0.3.2
+BuildRequires: pkgconfig(govirt-1.0) >= 0.3.2
 %endif
 
 %if 0%{?fedora} >= 20
@@ -94,12 +78,6 @@ autoreconf -if
 %define spice_arg --without-spice-gtk
 %endif
 
-%if %{with_gtk3}
-%define gtk_arg --with-gtk=3.0
-%else
-%define gtk_arg --with-gtk=2.0
-%endif
-
 %if %{with_govirt}
 %define govirt_arg --with-ovirt
 %endif
@@ -144,18 +122,10 @@ fi
 %doc README COPYING AUTHORS ChangeLog NEWS
 %{_bindir}/%{name}
 %{_bindir}/remote-viewer
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/ui/
-%{_datadir}/%{name}/ui/virt-viewer.xml
-%{_datadir}/%{name}/ui/virt-viewer-auth.xml
-%{_datadir}/%{name}/ui/virt-viewer-about.xml
-%{_datadir}/%{name}/ui/virt-viewer-guest-details.xml
-%{_datadir}/%{name}/ui/virt-viewer-vm-connection.xml
-%{_datadir}/%{name}/ui/virt-viewer-preferences.xml
-%{_datadir}/%{name}/ui/remote-viewer-connect.xml
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/devices/*
 %{_datadir}/applications/remote-viewer.desktop
+%{_datadir}/appdata/remote-viewer.appdata.xml
 %{_datadir}/mime/packages/virt-viewer-mime.xml
 %ghost %{_libexecdir}/spice-xpi-client
 %{_libexecdir}/spice-xpi-client-remote-viewer
@@ -163,6 +133,9 @@ fi
 %{_mandir}/man1/remote-viewer.1*
 
 %changelog
+* Thu Jun 30 2016 Daniel P. Berrange <berrange@redhat.com> - 4.0-1
+- Update to 4.0 release
+
 * Wed Jun 22 2016 Christophe Fergeau <cfergeau@redhat.com> - 3.0-3
 - Rebuild for spice-gtk ABI break