Rebased to version 0.10.0

Fix screenshots (bz #969410)
Add Fedora 19 osdict option (bz #950230)
Fix loading libguestfs OS icons (bz #905238)
Make packagekit search cancellable (bz #973777)
Fix freeze on guest shutdown if serial console connected (bz #967968)
This commit is contained in:
Cole Robinson 2013-06-19 18:49:14 -04:00
parent 1db73b1878
commit b39288a2d1
3 changed files with 17 additions and 18 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ virt-manager-0.8.4.tar.gz
/virt-manager-d3f9bc8e.tar.gz /virt-manager-d3f9bc8e.tar.gz
/virt-manager-b68faac8.tar.gz /virt-manager-b68faac8.tar.gz
/virt-manager-de1695b2.tar.gz /virt-manager-de1695b2.tar.gz
/virt-manager-0.10.0.tar.gz

View File

@ -1 +1 @@
2e9346157491dfad166f54962c632a20 virt-manager-de1695b2.tar.gz e23b8d2a7623b4e8e256c25735f332c8 virt-manager-0.10.0.tar.gz

View File

@ -5,9 +5,10 @@
%define disable_unsupported_rhel 0 %define disable_unsupported_rhel 0
%define askpass_package "openssh-askpass" %define askpass_package "openssh-askpass"
%define qemu_user "qemu" %define qemu_user "qemu"
%define libvirt_packages "libvirt-daemon-kvm" %define libvirt_packages "libvirt-daemon-kvm,libvirt-daemon-config-network"
%define preferred_distros "fedora,rhel" %define preferred_distros "fedora,rhel"
%define kvm_packages "qemu-system-x86" %define kvm_packages "qemu-system-x86"
%define default_graphics "spice"
%if 0%{?rhel} %if 0%{?rhel}
%define preferred_distros "rhel,fedora" %define preferred_distros "rhel,fedora"
@ -18,9 +19,9 @@
# End local config # End local config
%global gitcommit de1695b2
%define _version 0.10.0 %define _version 0.10.0
%define _release 0.5.git%{gitcommit} %define _release 1
# This macro is used for the continuous automated builds. It just # This macro is used for the continuous automated builds. It just
@ -38,14 +39,9 @@ Summary: Virtual Machine Manager
Group: Applications/Emulators Group: Applications/Emulators
License: GPLv2+ License: GPLv2+
URL: http://virt-manager.org/ URL: http://virt-manager.org/
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
#Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
# Generate source with
# git clone git://git.fedorahosted.org/git/virt-manager.git
# cd virt-manager
# git archive --output virt-manager-%{gitcommit}.tar.gz --prefix virt-manager-%{gitcommit}/ %{gitcommit}
Source: virt-manager-%{gitcommit}.tar.gz
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
Requires: pygobject3 Requires: pygobject3
@ -60,11 +56,6 @@ Requires: gtk-vnc2
Requires: spice-gtk3 Requires: spice-gtk3
%if %{with_guestfs}
Requires: python-libguestfs
%endif
BuildRequires: intltool BuildRequires: intltool
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
@ -111,7 +102,7 @@ machine).
%prep %prep
%setup -q -n virt-manager-%{gitcommit} %setup -q
%build %build
%if %{qemu_user} %if %{qemu_user}
@ -138,11 +129,10 @@ machine).
%define _disable_unsupported_rhel --hide-unsupported-rhel-options %define _disable_unsupported_rhel --hide-unsupported-rhel-options
%endif %endif
%if 0%{?default_graphics:1} %if %{default_graphics}
%define _default_graphics --default-graphics=%{default_graphics} %define _default_graphics --default-graphics=%{default_graphics}
%endif %endif
python setup.py configure \ python setup.py configure \
--pkgversion="%{version}" \ --pkgversion="%{version}" \
%{?_qemu_user} \ %{?_qemu_user} \
@ -223,6 +213,14 @@ fi
%changelog %changelog
* Wed Jun 19 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-1
- Rebased to version 0.10.0
- Fix screenshots (bz #969410)
- Add Fedora 19 osdict option (bz #950230)
- Fix loading libguestfs OS icons (bz #905238)
- Make packagekit search cancellable (bz #973777)
- Fix freeze on guest shutdown if serial console connected (bz #967968)
* Mon May 27 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.5.gitde1695b2 * Mon May 27 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.5.gitde1695b2
- Fix default graphics, should be spice+qxl (bz #965864) - Fix default graphics, should be spice+qxl (bz #965864)
- Check for libvirt default network package on first run (bz #950329) - Check for libvirt default network package on first run (bz #950329)