From ae7f39fce2a0c646a6574dc9146e4c27b8ef27db Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 24 Sep 2013 10:54:09 -0400 Subject: [PATCH] Sync with git Don't try to launch multiple ssh askpass dialogs at once (bz #811346) Fix confusion when multiple progress dialogs are run (bz #1003101) Fix error adding macvtap nic (bz #1006324) Add an appdata file (bz #1011120) virt-install: fix nfs:// style URLs (bz #1011177) Fix spice with TLS (bz #904295) Reduce impact of memory leak (bz #972371) Fix parsing rawhide .treeinfo (bz #989162) --- sources | 2 +- virt-manager.spec | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sources b/sources index a6be13b..3730a4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed8468478def38886c06582394574e72 virt-manager-948b5359.tar.gz +7cbea0e916f319842f0e85e7bb443da9 virt-manager-a2e52067.tar.gz diff --git a/virt-manager.spec b/virt-manager.spec index 54fc511..c4c66aa 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -21,8 +21,8 @@ %define _version 0.10.0 -%define _release 2 -%define gitcommit 948b5359 +%define _release 3 +%define gitcommit a2e52067 # This macro is used for the continuous automated builds. It just # allows an extra fragment based on the timestamp to be appended @@ -44,7 +44,7 @@ URL: http://virt-manager.org/ # git clone git://git.fedorahosted.org/virt-manager.git # cd virt-manager # git archive -o ../virt-manager-%{gitcommit}.tar.gz \ -# --prefix=virt-manager-%{version} %{gitcommit} +# --prefix=virt-manager-%{version}/ %{gitcommit} # #Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz Source0: virt-manager-%{gitcommit}.tar.gz @@ -71,7 +71,7 @@ BuildRequires: /usr/bin/pod2man %description Virtual Machine Manager provides a graphical tool for administering virtual -machines for KVM, Xen, and QEmu. Start, stop, add or remove virtual devices, +machines for KVM, Xen, and LXC. Start, stop, add or remove virtual devices, connect to a graphical or serial console, and see resource usage statistics for existing VMs on local or remote machines. Uses libvirt as the backend management API. @@ -192,6 +192,7 @@ fi %{_datadir}/%{name}/icons %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml @@ -223,6 +224,17 @@ fi %changelog +* Tue Sep 24 2013 Cole Robinson - 0.10.0-3.gita2e52067 +- Sync with git +- Don't try to launch multiple ssh askpass dialogs at once (bz #811346) +- Fix confusion when multiple progress dialogs are run (bz #1003101) +- Fix error adding macvtap nic (bz #1006324) +- Add an appdata file (bz #1011120) +- virt-install: fix nfs:// style URLs (bz #1011177) +- Fix spice with TLS (bz #904295) +- Reduce impact of memory leak (bz #972371) +- Fix parsing rawhide .treeinfo (bz #989162) + * Wed Aug 21 2013 Cole Robinson 0.10.0-2.git948b5359 - Update to git snapshot for ARM support