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 5176659..e71b0a3 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -20,7 +20,7 @@ Name: virt-manager Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?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-2 +- Fix screenshot on F24 rawhide (bz #1297988) +- Fix URL installs when content-length header missing (bz #1297900) + * Thu Dec 24 2015 Cole Robinson - 1.3.2-1 - Rebased to version 1.3.2 - Fix dependency issues with vte (bz #1290262)