From b0798ef8f7204c755d53a1915f58335df8fd898f Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 17 Mar 2016 10:48:06 -0400 Subject: [PATCH 1/3] Fix screenshot on F24 rawhide (bz #1297988) Fix URL installs when content-length header missing (bz #1297900) --- ...screenshot-on-F24-rawhide-bz-1297988.patch | 24 +++++++++++++++ ...RL-installs-when-content-length-head.patch | 29 +++++++++++++++++++ virt-manager.spec | 16 +++++++++- 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch create mode 100644 0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch diff --git a/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch b/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch new file mode 100644 index 0000000..134614f --- /dev/null +++ b/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch @@ -0,0 +1,24 @@ +From: Cole Robinson +Date: Fri, 15 Jan 2016 15:07:58 -0500 +Subject: [PATCH virt-manager] details: Fix screenshot on F24 rawhide (bz + 1297988) + +(cherry picked from commit f454798b337aedb881671f62fe3b25fad703b768) +--- + virtManager/details.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/virtManager/details.py b/virtManager/details.py +index 0bd2569..3dbd82f 100644 +--- a/virtManager/details.py ++++ b/virtManager/details.py +@@ -1486,6 +1486,9 @@ class vmmDetails(vmmGObjectUI): + # and future proof it a bit + if type(ret) is tuple and len(ret) >= 2: + ret = ret[1] ++ # F24 rawhide, ret[1] is a named tuple with a 'buffer' element... ++ if hasattr(ret, "buffer"): ++ ret = ret.buffer + + import datetime + now = str(datetime.datetime.now()).split(".")[0].replace(" ", "_") diff --git a/0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch b/0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch new file mode 100644 index 0000000..03fec7d --- /dev/null +++ b/0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch @@ -0,0 +1,29 @@ +From: Cole Robinson +Date: Tue, 12 Jan 2016 12:45:02 -0500 +Subject: [PATCH virt-manager] urlfetcher: Fix URL installs when content-length + header missing + +Suggested-by: bduff@sjm.com +(cherry picked from commit eae7dc061968a83fef8ebb632c8f939621ff22b1) +--- + virtinst/urlfetcher.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py +index 6181a5a..3266186 100644 +--- a/virtinst/urlfetcher.py ++++ b/virtinst/urlfetcher.py +@@ -186,8 +186,11 @@ class _HTTPURLFetcher(_URLFetcher): + """ + response = requests.get(url, stream=True) + response.raise_for_status() +- size = response.headers.get('content-length') +- return response, size.isdigit() and int(size) or None ++ try: ++ size = int(response.headers.get('content-length')) ++ except: ++ size = None ++ return response, size + + def _write(self, urlobj, fileobj): + """ diff --git a/virt-manager.spec b/virt-manager.spec index 191d48f..a1653f9 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -20,7 +20,7 @@ Name: virt-manager Version: 1.3.2 -Release: 2%{?dist} +Release: 3%{?dist} %define verrel %{version}-%{release} Summary: Desktop tool for managing virtual machines via libvirt @@ -28,6 +28,11 @@ Group: Applications/Emulators License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz + +# Fix screenshot on F24 rawhide (bz #1297988) +Patch0001: 0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch +# Fix URL installs when content-length header missing (bz #1297900) +Patch0002: 0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch BuildArch: noarch @@ -106,6 +111,11 @@ machine). %prep %setup -q +# Fix screenshot on F24 rawhide (bz #1297988) +%patch0001 -p1 +# Fix URL installs when content-length header missing (bz #1297900) +%patch0002 -p1 + %build %if %{qemu_user} %define _qemu_user --qemu-user=%{qemu_user} @@ -219,6 +229,10 @@ fi %{_bindir}/virt-xml %changelog +* Thu Mar 17 2016 Cole Robinson - 1.3.2-3 +- Fix screenshot on F24 rawhide (bz #1297988) +- Fix URL installs when content-length header missing (bz #1297900) + * Fri Feb 05 2016 Fedora Release Engineering - 1.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 65aadae9dc384fff4eae33f497ddd2227f641297 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 20 May 2016 17:23:10 -0400 Subject: [PATCH 2/3] Rebase to latest git Update translations (bz #1323015) Fix rawhide URL installs (bz #1322011) Update viewer to work with spice GL --- ...screenshot-on-F24-rawhide-bz-1297988.patch | 24 -------- ...RL-installs-when-content-length-head.patch | 29 --------- sources | 2 +- virt-manager.spec | 61 +++++++++---------- 4 files changed, 30 insertions(+), 86 deletions(-) delete mode 100644 0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch delete mode 100644 0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch diff --git a/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch b/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch deleted file mode 100644 index 134614f..0000000 --- a/0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Cole Robinson -Date: Fri, 15 Jan 2016 15:07:58 -0500 -Subject: [PATCH virt-manager] details: Fix screenshot on F24 rawhide (bz - 1297988) - -(cherry picked from commit f454798b337aedb881671f62fe3b25fad703b768) ---- - virtManager/details.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/virtManager/details.py b/virtManager/details.py -index 0bd2569..3dbd82f 100644 ---- a/virtManager/details.py -+++ b/virtManager/details.py -@@ -1486,6 +1486,9 @@ class vmmDetails(vmmGObjectUI): - # and future proof it a bit - if type(ret) is tuple and len(ret) >= 2: - ret = ret[1] -+ # F24 rawhide, ret[1] is a named tuple with a 'buffer' element... -+ if hasattr(ret, "buffer"): -+ ret = ret.buffer - - import datetime - now = str(datetime.datetime.now()).split(".")[0].replace(" ", "_") diff --git a/0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch b/0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch deleted file mode 100644 index 03fec7d..0000000 --- a/0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Cole Robinson -Date: Tue, 12 Jan 2016 12:45:02 -0500 -Subject: [PATCH virt-manager] urlfetcher: Fix URL installs when content-length - header missing - -Suggested-by: bduff@sjm.com -(cherry picked from commit eae7dc061968a83fef8ebb632c8f939621ff22b1) ---- - virtinst/urlfetcher.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py -index 6181a5a..3266186 100644 ---- a/virtinst/urlfetcher.py -+++ b/virtinst/urlfetcher.py -@@ -186,8 +186,11 @@ class _HTTPURLFetcher(_URLFetcher): - """ - response = requests.get(url, stream=True) - response.raise_for_status() -- size = response.headers.get('content-length') -- return response, size.isdigit() and int(size) or None -+ try: -+ size = int(response.headers.get('content-length')) -+ except: -+ size = None -+ return response, size - - def _write(self, urlobj, fileobj): - """ diff --git a/sources b/sources index 7b92364..ed84abb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d0436939769b66457034b1ae7040b85 virt-manager-1.3.2.tar.gz +8d20f953bab6caa9b347fc702258e55a virt-manager-1.3.2-20160520git2204de62d9.tar.gz diff --git a/virt-manager.spec b/virt-manager.spec index a1653f9..0412fd3 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,39 +1,35 @@ # -*- rpm-spec -*- -%define with_guestfs 0 -%define stable_defaults 0 -%define askpass_package "openssh-askpass" -%define qemu_user "qemu" -%define libvirt_packages "libvirt-daemon-kvm,libvirt-daemon-config-network" -%define kvm_packages "" -%define preferred_distros "fedora,rhel" -%define default_hvs "qemu,xen,lxc" +%global with_guestfs 0 +%global stable_defaults 0 +%global askpass_package "openssh-askpass" +%global qemu_user "qemu" +%global libvirt_packages "libvirt-daemon-kvm,libvirt-daemon-config-network" +%global kvm_packages "" +%global preferred_distros "fedora,rhel" +%global default_hvs "qemu,xen,lxc" %if 0%{?rhel} -%define preferred_distros "rhel,fedora" -%define stable_defaults 1 +%global preferred_distros "rhel,fedora" +%global stable_defaults 1 %endif # End local config - +%global gittag 20160520git2204de62d9 Name: virt-manager Version: 1.3.2 -Release: 3%{?dist} -%define verrel %{version}-%{release} +Release: 4.%{gittag}%{?dist} +%global verrel %{version}-%{release} Summary: Desktop tool for managing virtual machines via libvirt Group: Applications/Emulators License: GPLv2+ -URL: http://virt-manager.org/ -Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz - -# Fix screenshot on F24 rawhide (bz #1297988) -Patch0001: 0001-details-Fix-screenshot-on-F24-rawhide-bz-1297988.patch -# Fix URL installs when content-length header missing (bz #1297900) -Patch0002: 0002-urlfetcher-Fix-URL-installs-when-content-length-head.patch BuildArch: noarch +URL: http://virt-manager.org/ +#Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}-%{gittag}.tar.gz Requires: virt-manager-common = %{verrel} @@ -111,38 +107,33 @@ machine). %prep %setup -q -# Fix screenshot on F24 rawhide (bz #1297988) -%patch0001 -p1 -# Fix URL installs when content-length header missing (bz #1297900) -%patch0002 -p1 - %build %if %{qemu_user} -%define _qemu_user --qemu-user=%{qemu_user} +%global _qemu_user --qemu-user=%{qemu_user} %endif %if %{kvm_packages} -%define _kvm_packages --kvm-package-names=%{kvm_packages} +%global _kvm_packages --kvm-package-names=%{kvm_packages} %endif %if %{preferred_distros} -%define _preferred_distros --preferred-distros=%{preferred_distros} +%global _preferred_distros --preferred-distros=%{preferred_distros} %endif %if %{libvirt_packages} -%define _libvirt_packages --libvirt-package-names=%{libvirt_packages} +%global _libvirt_packages --libvirt-package-names=%{libvirt_packages} %endif %if %{askpass_package} -%define _askpass_package --askpass-package-names=%{askpass_package} +%global _askpass_package --askpass-package-names=%{askpass_package} %endif %if %{stable_defaults} -%define _stable_defaults --stable-defaults +%global _stable_defaults --stable-defaults %endif %if %{default_hvs} -%define _default_hvs --default-hvs %{default_hvs} +%global _default_hvs --default-hvs %{default_hvs} %endif python setup.py configure \ @@ -229,6 +220,12 @@ fi %{_bindir}/virt-xml %changelog +* Fri May 20 2016 Cole Robinson - 1.3.2-4.20160520git2204de62d9 +- Rebase to latest git +- Update translations (bz #1323015) +- Fix rawhide URL installs (bz #1322011) +- Update viewer to work with spice GL + * Thu Mar 17 2016 Cole Robinson - 1.3.2-3 - Fix screenshot on F24 rawhide (bz #1297988) - Fix URL installs when content-length header missing (bz #1297900) From 322d5db57f06734e956cd98ebc15b74586939f94 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 18 Jun 2016 10:35:24 -0400 Subject: [PATCH 3/3] Rebased to version 1.4.0 --- sources | 2 +- virt-manager.spec | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sources b/sources index ed84abb..2716272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d20f953bab6caa9b347fc702258e55a virt-manager-1.3.2-20160520git2204de62d9.tar.gz +3cb69f1d108ae6d16bab2fce7ec639ea virt-manager-1.4.0.tar.gz diff --git a/virt-manager.spec b/virt-manager.spec index 0412fd3..399c13f 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -17,10 +17,10 @@ # End local config -%global gittag 20160520git2204de62d9 + Name: virt-manager -Version: 1.3.2 -Release: 4.%{gittag}%{?dist} +Version: 1.4.0 +Release: 1%{?dist} %global verrel %{version}-%{release} Summary: Desktop tool for managing virtual machines via libvirt @@ -28,8 +28,7 @@ Group: Applications/Emulators License: GPLv2+ BuildArch: noarch URL: http://virt-manager.org/ -#Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Source0: %{name}-%{version}-%{gittag}.tar.gz +Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz Requires: virt-manager-common = %{verrel} @@ -107,6 +106,7 @@ machine). %prep %setup -q + %build %if %{qemu_user} %global _qemu_user --qemu-user=%{qemu_user} @@ -152,6 +152,13 @@ python setup.py \ install -O1 --root=%{buildroot} %find_lang %{name} +# Replace '#!/usr/bin/env python2' with '#!/usr/bin/python2' +# The format is ideal for upstream, but not a distro. See: +# https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython +for f in $(find %{buildroot} -type f -executable -print); do + sed -i "1 s|^#!/usr/bin/env python2|#!%{__python2}|" $f || : +done + # The conversion script was only added to virt-manager after several # Fedora cycles of using gsettings. Installing it now could convert old data # and wipe out recent settings. @@ -220,6 +227,9 @@ fi %{_bindir}/virt-xml %changelog +* Sat Jun 18 2016 Cole Robinson - 1.4.0-1 +- Rebased to version 1.4.0 + * Fri May 20 2016 Cole Robinson - 1.3.2-4.20160520git2204de62d9 - Rebase to latest git - Update translations (bz #1323015)