From 7e410a665d50e8246ec5d2dc1ea7a1fc98f2b541 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Jun 08 2018 11:12:17 +0000
Subject: Update to 3.28.5


---

diff --git a/gnome-boxes-3.26.1-use-virtio.patch b/gnome-boxes-3.26.1-use-virtio.patch
deleted file mode 100644
index 8fdc944..0000000
--- a/gnome-boxes-3.26.1-use-virtio.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d8898e8b28ddad9e9b3f08510a6f309d1b225e58 Mon Sep 17 00:00:00 2001
-From: Felipe Borges <felipeborges@gnome.org>
-Date: Tue, 17 Oct 2017 16:09:18 +0200
-Subject: [PATCH] switch to virtio
-
----
- src/vm-configurator.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
-index 38207a87..f75e5e7f 100644
---- a/src/vm-configurator.vala
-+++ b/src/vm-configurator.vala
-@@ -350,7 +350,7 @@ private static void set_os_config (Domain domain, InstallerMedia install_media,
- 
-     private static void set_video_config (Domain domain, InstallerMedia install_media) {
-         var video = new DomainVideo ();
--        video.set_model (DomainVideoModel.QXL);
-+        video.set_model (DomainVideoModel.VIRTIO);
- 
-         domain.add_device (video);
-     }
--- 
-2.14.2
-
diff --git a/gnome-boxes-unbreak-the-icon-installation.patch b/gnome-boxes-unbreak-the-icon-installation.patch
new file mode 100644
index 0000000..4e24c84
--- /dev/null
+++ b/gnome-boxes-unbreak-the-icon-installation.patch
@@ -0,0 +1,56 @@
+From e8b9d5ca5ebed5f2e076e6e6c975ec37efc21c5b Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Fri, 8 Jun 2018 12:42:49 +0200
+Subject: [PATCH] build: Unbreak the icon installation in gnome-3-28
+
+The icons were getting directly copied to $data_dir/icons without
+retaining the directory hierarchy inside.
+
+Fallout from d2410d0959094dee8cc3e1276b255e8fb991fe31
+
+It was also broken in master, but was fixed by
+c115f5bfb56aa9fe42356c5f4f9ee87f6c87f454 and
+578707e9924c32a808e12c2830f18156ccb109f6
+
+https://gitlab.gnome.org/GNOME/gnome-boxes/issues/217
+---
+ data/meson.build | 26 +-------------------------
+ 1 file changed, 1 insertion(+), 25 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 847734e59715..9f1c4b482356 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,28 +1,4 @@
+-icondir = join_paths(data_dir, 'icons')
+-
+-install_data('icons/hicolor/16x16/apps/org.gnome.Boxes.png',
+-  install_dir: icondir,
+-)
+-
+-install_data('icons/hicolor/24x24/apps/org.gnome.Boxes.png',
+-  install_dir: icondir,
+-)
+-
+-install_data('icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg',
+-  install_dir: icondir,
+-)
+-install_data('icons/hicolor/32x32/apps/org.gnome.Boxes.png',
+-  install_dir: icondir,
+-)
+-
+-install_data('icons/hicolor/48x48/apps/org.gnome.Boxes.png',
+-  install_dir: icondir,
+-)
+-
+-install_data('icons/hicolor/256x256/apps/org.gnome.Boxes.png',
+-  install_dir: icondir,
+-)
+-
++install_subdir('icons/hicolor/', install_dir: join_paths (data_dir, 'icons'))
+ 
+ resource_files = files ('gnome-boxes.gresource.xml')
+ resources = gnome.compile_resources ('org.gnome.Boxes',
+-- 
+2.14.4
+
diff --git a/gnome-boxes.spec b/gnome-boxes.spec
index 7c3a996..a8cabb5 100644
--- a/gnome-boxes.spec
+++ b/gnome-boxes.spec
@@ -30,7 +30,7 @@ ExclusiveArch: x86_64
 %global url_ver	%%(echo %{version}|cut -d. -f1,2)
 
 Name:		gnome-boxes
-Version:	3.28.4
+Version:	3.28.5
 Release:	1%{?dist}
 Summary:	A simple GNOME 3 application to access remote or virtual systems
 
@@ -38,7 +38,8 @@ License:	LGPLv2+
 URL:		https://wiki.gnome.org/Apps/Boxes
 Source0:	http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
 
-Patch0:		gnome-boxes-3.26.1-use-virtio.patch
+# https://gitlab.gnome.org/GNOME/gnome-boxes/issues/217
+Patch0:		gnome-boxes-unbreak-the-icon-installation.patch
 
 BuildRequires:	gettext >= 0.19.8
 BuildRequires:	meson
@@ -134,8 +135,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
 %{_datadir}/%{name}/
 %{_datadir}/applications/org.gnome.Boxes.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.boxes.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/gnome-boxes.*
-%{_datadir}/icons/hicolor/symbolic/apps/gnome-boxes-symbolic.svg
+%{_datadir}/icons/hicolor/*/apps/org.gnome.Boxes.png
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg
 %{_libexecdir}/gnome-boxes-search-provider
 %{_datadir}/dbus-1/services/org.gnome.Boxes.SearchProvider.service
 %{_datadir}/dbus-1/services/org.gnome.Boxes.service
@@ -145,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
 %{_datadir}/metainfo/org.gnome.Boxes.appdata.xml
 
 %changelog
+* Fri Jun 08 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.28.5-1
+- Update to 3.28.5
+
 * Wed May 09 2018 Kalev Lember <klember@redhat.com> - 3.28.4-1
 - Update to 3.28.4
 
diff --git a/sources b/sources
index c23fc48..abb6bdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-boxes-3.28.4.tar.xz) = 1ab63db7a1df29bcaa7768a35d5a246ff8e0ef55c6d5cd95bf88563eae6bf4a4f96e7c44dcc3d5fb70ca5a75f7f9e3c6fa4ea2886d09d40f76740d3dae9c5f2b
+SHA512 (gnome-boxes-3.28.5.tar.xz) = c4edb5744b24073f9d8b7dda75bf497e4920fde78e5a3853350b999c70e6f34e0f684585bb7e8cf8ecc5b2ff7d705d7827ecf27bad20d10eb3f534504bf041cd