Update to virt-viewer 4.0 release

This commit is contained in:
Daniel P. Berrange 2016-06-30 15:19:24 +01:00
parent 4eb2a00771
commit 926a661a8e
2 changed files with 16 additions and 43 deletions

View File

@ -1 +1 @@
f36b1b85da943eba7ad72fd93ba63435 virt-viewer-3.0.tar.gz d92d09ba29413c4aa0498e7cccf4eea2 virt-viewer-4.0.tar.gz

View File

@ -5,11 +5,6 @@
# touch configure.ac or Makefile.am. # touch configure.ac or Makefile.am.
%{!?enable_autotools:%define enable_autotools 0} %{!?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 %define with_spice 0
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
%define with_spice 1 %define with_spice 1
@ -21,8 +16,8 @@
%endif %endif
Name: virt-viewer Name: virt-viewer
Version: 3.0 Version: 4.0
Release: 3%{?dist}%{?extra_release} Release: 1%{?dist}%{?extra_release}
Summary: Virtual Machine Viewer Summary: Virtual Machine Viewer
Group: Applications/System Group: Applications/System
License: GPLv2+ License: GPLv2+
@ -42,31 +37,20 @@ BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
%endif %endif
BuildRequires: glib2-devel >= 2.22.0 BuildRequires: pkgconfig(glib-2.0) >= 2.38
%if %{with_gtk3} BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
BuildRequires: gtk3-devel >= 3.0 BuildRequires: pkgconfig(libvirt) >= 0.10.0
%else BuildRequires: pkgconfig(libvirt-glib-1.0) >= 0.1.8
BuildRequires: gtk2-devel >= 2.18.0 BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0
%endif BuildRequires: pkgconfig(gtk-vnc-2.0) >= 0.4.0
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
%if %{with_spice} %if %{with_spice}
%if %{with_gtk3} BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.31
BuildRequires: spice-gtk3-devel >= 0.32 BuildRequires: pkgconfig(spice-protocol) >= 0.12.7
%else
BuildRequires: spice-gtk-devel >= 0.30
%endif
BuildRequires: spice-protocol >= 0.12.7
%endif %endif
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: intltool BuildRequires: intltool
%if %{with_govirt} %if %{with_govirt}
BuildRequires: libgovirt-devel >= 0.3.2 BuildRequires: pkgconfig(govirt-1.0) >= 0.3.2
%endif %endif
%if 0%{?fedora} >= 20 %if 0%{?fedora} >= 20
@ -94,12 +78,6 @@ autoreconf -if
%define spice_arg --without-spice-gtk %define spice_arg --without-spice-gtk
%endif %endif
%if %{with_gtk3}
%define gtk_arg --with-gtk=3.0
%else
%define gtk_arg --with-gtk=2.0
%endif
%if %{with_govirt} %if %{with_govirt}
%define govirt_arg --with-ovirt %define govirt_arg --with-ovirt
%endif %endif
@ -144,18 +122,10 @@ fi
%doc README COPYING AUTHORS ChangeLog NEWS %doc README COPYING AUTHORS ChangeLog NEWS
%{_bindir}/%{name} %{_bindir}/%{name}
%{_bindir}/remote-viewer %{_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/*/apps/*
%{_datadir}/icons/hicolor/*/devices/* %{_datadir}/icons/hicolor/*/devices/*
%{_datadir}/applications/remote-viewer.desktop %{_datadir}/applications/remote-viewer.desktop
%{_datadir}/appdata/remote-viewer.appdata.xml
%{_datadir}/mime/packages/virt-viewer-mime.xml %{_datadir}/mime/packages/virt-viewer-mime.xml
%ghost %{_libexecdir}/spice-xpi-client %ghost %{_libexecdir}/spice-xpi-client
%{_libexecdir}/spice-xpi-client-remote-viewer %{_libexecdir}/spice-xpi-client-remote-viewer
@ -163,6 +133,9 @@ fi
%{_mandir}/man1/remote-viewer.1* %{_mandir}/man1/remote-viewer.1*
%changelog %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 * Wed Jun 22 2016 Christophe Fergeau <cfergeau@redhat.com> - 3.0-3
- Rebuild for spice-gtk ABI break - Rebuild for spice-gtk ABI break