From 401f6c1b05d3178254ddbfb48170c845bf945524 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 14 Feb 2014 19:15:59 -0500
Subject: [PATCH] Rebased to version 1.0.0

New tool virt-xml: Edit libvirt XML in one shot from the command line
Improved defaults: qcow2, USB2, host CPU model, guest agent channel
Introspect command line options like --disk=? or --network=help
---
 sources           |  2 +-
 virt-manager.spec | 40 ++++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/sources b/sources
index d57b211..2653629 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c82294f7647ba14746a64c947c52b9f  virt-manager-1ffcc0cc.tar.gz
+8a0585de48d8060a5394aae912342c95  virt-manager-1.0.0.tar.gz
diff --git a/virt-manager.spec b/virt-manager.spec
index 9c21639..c389ddc 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -2,7 +2,7 @@
 
 
 %define with_guestfs               0
-%define disable_unsupported_rhel   0
+%define stable_defaults            0
 %define askpass_package            "openssh-askpass"
 %define qemu_user                  "qemu"
 %define libvirt_packages           "libvirt-daemon-kvm,libvirt-daemon-config-network"
@@ -12,16 +12,16 @@
 %if 0%{?rhel}
 %define preferred_distros          "rhel,fedora"
 %define kvm_packages               "qemu-kvm"
-%define disable_unsupported_rhel   1
+%define stable_defaults            1
 %endif
 
 
 # End local config
 
 
-%define _version 0.10.0
-%define _release 5
-%define gitcommit 1ffcc0cc
+%define _version 1.0.0
+%define _release 1
+
 
 # This macro is used for the continuous automated builds. It just
 # allows an extra fragment based on the timestamp to be appended
@@ -31,24 +31,17 @@
 
 Name: virt-manager
 Version: %{_version}
-Release: %{_release}.git%{gitcommit}%{_extra_release}
+Release: %{_release}%{_extra_release}
 %define verrel %{version}-%{release}
 
 Summary: Virtual Machine Manager
 Group: Applications/Emulators
 License: GPLv2+
 URL: http://virt-manager.org/
-# To prepare:
-#
-# 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}
-#
-#Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
-Source0: virt-manager-%{gitcommit}.tar.gz
+Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
 BuildArch: noarch
 
+
 Requires: virt-manager-common = %{verrel}
 Requires: pygobject3
 Requires: gtk3
@@ -56,6 +49,7 @@ Requires: libvirt-glib >= 0.0.9
 Requires: libxml2-python
 Requires: vte3
 Requires: dconf
+Requires: dbus-x11
 
 # For console widget
 Requires: gtk-vnc2
@@ -99,6 +93,7 @@ Provides: virt-install
 Provides: virt-clone
 Provides: virt-image
 Provides: virt-convert
+Provides: virt-xml
 Obsoletes: python-virtinst
 
 %description -n virt-install
@@ -131,8 +126,8 @@ machine).
 %define _askpass_package --askpass-package-names=%{askpass_package}
 %endif
 
-%if %{disable_unsupported_rhel}
-%define _disable_unsupported_rhel --hide-unsupported-rhel-options
+%if %{stable_defaults}
+%define _stable_defaults --stable-defaults
 %endif
 
 python setup.py configure \
@@ -142,7 +137,7 @@ python setup.py configure \
     %{?_libvirt_packages} \
     %{?_askpass_package} \
     %{?_preferred_distros} \
-    %{?_disable_unsupported_rhel}
+    %{?_stable_defaults}
 
 
 %install
@@ -200,6 +195,7 @@ fi
 %{_mandir}/man1/virt-install.1*
 %{_mandir}/man1/virt-clone.1*
 %{_mandir}/man1/virt-convert.1*
+%{_mandir}/man1/virt-xml.1*
 %{_mandir}/man1/virt-image.1*
 %{_mandir}/man5/virt-image.5*
 
@@ -207,14 +203,22 @@ fi
 %{_datadir}/%{name}/virt-clone
 %{_datadir}/%{name}/virt-image
 %{_datadir}/%{name}/virt-convert
+%{_datadir}/%{name}/virt-xml
 
 %{_bindir}/virt-install
 %{_bindir}/virt-clone
 %{_bindir}/virt-image
 %{_bindir}/virt-convert
+%{_bindir}/virt-xml
 
 
 %changelog
+* Fri Feb 14 2014 Cole Robinson <crobinso@redhat.com> - 1.0.0-1
+- Rebased to version 1.0.0
+- New tool virt-xml: Edit libvirt XML in one shot from the command line
+- Improved defaults: qcow2, USB2, host CPU model, guest agent channel
+- Introspect command line options like --disk=? or --network=help
+
 * Sun Nov 10 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-5.git1ffcc0cc
 - Fix vcpu vs. maxvcpu UI (bz #1016318)
 - Fix app startup when run as root (bz #1016435)