From 89bc1be7af49457ac73459bbce86e0d694d06645 Mon Sep 17 00:00:00 2001
From: "Danilo C. L. de Paula" <ddepaula@redhat.com>
Date: Thu, 23 Aug 2018 13:44:07 -0300
Subject: [PATCH] Update to 1.9.6-1, from RHEL 7.6

Update virtio-win based on RHEL-7.6
Resolves: BZ#1518460
---
 .gitignore      |  1 +
 sources         |  8 ++++----
 virtio-win.spec | 18 +++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8e0e95..ccd1805 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@
 /virtio-win-prewhql-0.1-140-sources.zip
 /virtio-win-prewhql-0.1-141-sources.zip
 /virtio-win-1.9.3-bin-for-rpm.tar.gz
+/virtio-win-1.9.6-bin-for-rpm.tar.gz
diff --git a/sources b/sources
index 4fc1da4..3b77af0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (qxl-win-unsigned-0.1-24-sources.zip) = 5fa5e63f37c9f25a164f8e9f0cb72ff0e333ac32dee55546f23f6555f1c66cbac5d6904a7f85dda45f3dc3e077c46b65071ff397d792b459fc58b6dd87f402f9
-SHA512 (qemu-ga-win-7.4.5-1-installers.zip) = 1fcdd8ad5585b48bc12691f9b5de6d1e073e8f3af217a135cd45720d631a89cdd03d5e78b0c519ddd1d3033b2664aec7b487db5d1ae14f9285b9208cc24c2f78
-SHA512 (qemu-ga-win-7.4.5-1-sources.zip) = cd66a13d6a041d67b7c9d3b3944408831ecb0992b49e8d92127b282ef550622cb105468f904837f585174761976005d21c28b70e13fec0cd73a1a8b26bf63974
-SHA512 (virtio-win-1.9.3-bin-for-rpm.tar.gz) = 7f713df466182c241f21460c4ede6aed67fa3ac46e6ee385dd079e1e293f950fcac3326b8ba3687252ce7c52fb947126e63f5825fdc56ab6e1ff24f9ae64b970
-SHA512 (virtio-win-prewhql-0.1-141-sources.zip) = 1aba5570623a263a01f5cc75d8d166fc5aa82f61e8ff084e08b67786853fe93fe0802671bb6155309f7a6991e764a96302f7359b8491e66f139b0fb301197038
+SHA512 (mingw-qemu-ga-win-7.6.2-2-installers.zip) = 518331d9cc66e0ec1d920ed07dac55eeb5411aab81ff4ce282684347ec9c87b8d40ccdec165f8cb7f7714393a9e372e5e358c9c9b3b290fbe155474f517a6254
+SHA512 (mingw-qemu-ga-win-7.6.2-2-sources.zip) = 806ecb4a39fc1aae87186c81e49d635352aa881e811848d31d2d33b866fe80a554ca40c1428e1e2ee81fcdbb29ff79cfd992adba4f47789f8d13d02a152a2d26
+SHA512 (virtio-win-prewhql-0.1-160-sources.zip) = 5aa85dc7da202ed4508725921c8e629ae612069b033afdb8a4720262651b4d7f17dbf47dee470deab3901c0d524517ed1d0db7ca290d69432da6978f6ff24dc3
+SHA512 (virtio-win-1.9.6-bin-for-rpm.tar.gz) = cd6c7558d5ce89d10bebcaea6431c0b817ccbf861d00a0743338b47d8452a4058f4a8cd219c47181bcff23aa5a7dfa05ea3f443b4eec9d451c54512abf7aec95
diff --git a/virtio-win.spec b/virtio-win.spec
index a51de56..98177d9 100644
--- a/virtio-win.spec
+++ b/virtio-win.spec
@@ -3,14 +3,14 @@
 # affect the RPM content, please submit a patch them to the upstream spec
 # file hosted at: https://github.com/crobinso/virtio-win-pkg-scripts
 
-%global virtio_win_prewhql_build virtio-win-prewhql-0.1-141
-%global qemu_ga_win_build qemu-ga-win-7.4.5-1
+%global virtio_win_prewhql_build virtio-win-prewhql-0.1-160
+%global qemu_ga_win_build mingw-qemu-ga-win-7.6.2-2
 %global qxl_build qxl-win-unsigned-0.1-24
 
 Summary: VirtIO para-virtualized drivers for Windows(R)
 Name: virtio-win
-Version: 1.9.3
-Release: 3%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
 Group: Applications/System
 URL: http://www.redhat.com/
 BuildArch: noarch
@@ -52,7 +52,7 @@ Windows(R) guests.
 %{__mv} %{qemu_ga_win_build} guest-agent
 
 # Generate .iso
-/usr/bin/mkisofs -m vfddrivers -o %{name}-%{version}.iso -r -J \
+/usr/bin/mkisofs -m 'virtio-win*.vfd' -m vfddrivers -o %{name}-%{version}.iso -r -J \
   -input-charset iso8859-1 -V "%{name}-%{version}" .
 
 
@@ -69,6 +69,11 @@ Windows(R) guests.
 %{__install} -p -m0644 %{name}-%{version}_amd64.vfd  %{buildroot}%{_datadir}/%{name}
 %{__ln_s} %{name}-%{version}_amd64.vfd %{buildroot}%{_datadir}/%{name}/%{name}_amd64.vfd
 
+%{__install} -p -m0644 %{name}-%{version}_servers_x86.vfd  %{buildroot}%{_datadir}/%{name}
+%{__ln_s} %{name}-%{version}_servers_x86.vfd %{buildroot}%{_datadir}/%{name}/%{name}_servers_x86.vfd
+%{__install} -p -m0644 %{name}-%{version}_servers_amd64.vfd  %{buildroot}%{_datadir}/%{name}
+%{__ln_s} %{name}-%{version}_servers_amd64.vfd %{buildroot}%{_datadir}/%{name}/%{name}_servers_amd64.vfd
+
 %{__cp} -a vfddrivers %{buildroot}/%{_datadir}/%{name}/drivers
 %{__cp} -a guest-agent %{buildroot}/%{_datadir}/%{name}
 
@@ -84,6 +89,9 @@ Windows(R) guests.
 
 
 %changelog
+* Fri Aug 24 2018 Danilo C. L. de Paula <ddepaula@redhat.com> - 1.9.6-1
+- Rebase virtio-win based on RHEL-7.6
+
 * Mon Aug 13 2018 Troy Dawson <tdawson@redhat.com> - 1.9.3-3
 - Release Bumped for el8 Mass Rebuild