From ce9e2280632205702b6b3ca5f4c65f1040c42d30 Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Tue, 29 Oct 2013 20:00:14 -0400
Subject: [PATCH] - Update to the latest version of the drivers - Add qemu-ga
 installers to the .iso

---
 .gitignore      |  5 +++++
 sources         |  9 +++++----
 virtio-win.spec | 25 +++++++++++++------------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2205d4..2f09605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,8 @@
 /virtio-win-1.6.6-bin-whql.zip
 /virtio-win-1.6.6_x86-drivers.zip
 /virtio-win-1.6.6.zip
+/qemu-ga-win-6.5-4-installers.zip
+/virtio-win-1.6.7_amd64-drivers.zip
+/virtio-win-1.6.7-bin-whql.zip
+/virtio-win-1.6.7_x86-drivers.zip
+/virtio-win-1.6.7.zip
diff --git a/sources b/sources
index caf6324..472ac55 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
-70a7f45071608f774807dfde2752d71b  virtio-win-1.6.6_amd64-drivers.zip
-692789dd0979f39a3ae13aaaa14d7b38  virtio-win-1.6.6-bin-whql.zip
-29334a57d591be52b862e0d453dea02d  virtio-win-1.6.6_x86-drivers.zip
-4ff50f74c187c7b6f30b30662f25257b  virtio-win-1.6.6.zip
+8488a7f242f5a21ff10ab12d8112a1cc  qemu-ga-win-6.5-4-installers.zip
+a89b4f6978de5b9085521c25a272b6da  virtio-win-1.6.7_amd64-drivers.zip
+fa7c90d7a4f636e50aa52cb0ecde34e1  virtio-win-1.6.7-bin-whql.zip
+a9473d8a21bcaddcc64e41d1933ef478  virtio-win-1.6.7_x86-drivers.zip
+c5eceede752298b88f5ed152914979bd  virtio-win-1.6.7.zip
diff --git a/virtio-win.spec b/virtio-win.spec
index a40578e..7dd94e9 100644
--- a/virtio-win.spec
+++ b/virtio-win.spec
@@ -1,6 +1,8 @@
+%global qemu_ga_win_build qemu-ga-win-6.5-4
+
 Summary: VirtIO para-virtualized drivers for Windows(R)
 Name: virtio-win
-Version: 1.6.6
+Version: 1.6.7
 Release: 1%{?dist}
 License: Red Hat Proprietary
 Group: Applications/System
@@ -9,14 +11,10 @@ Source0: %{name}-%{version}.zip
 Source1: %{name}-%{version}-bin-whql.zip
 Source2: %{name}-%{version}_x86-drivers.zip
 Source3: %{name}-%{version}_amd64-drivers.zip
+Source4: %{qemu_ga_win_build}-installers.zip
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires:  /usr/bin/mkisofs
-BuildRequires: qemu-guest-agent-win32
-BuildRequires: mingw32-glib2
-BuildRequires: mingw32-iconv
-BuildRequires: mingw32-gettext
-BuildRequires: unix2dos
 
 %description
 VirtIO para-virtualized Windows(R) drivers for 32-bit and 64-bit
@@ -26,14 +24,10 @@ Windows(R) guests.
 %setup -q -T -b 1 -n %{name}-%{version}
 %setup -q -T -a 2 -n %{name}-%{version} -D
 %setup -q -T -a 3 -n %{name}-%{version} -D
+%setup -q -T -a 4 -n %{name}-%{version} -D
 
 %build
-%{__mkdir} guest-agent
-%{__cp} -p %{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libglib-2.0-0.dll guest-agent
-%{__cp} -p %{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libiconv-2.dll guest-agent
-%{__cp} -p %{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libintl-8.dll guest-agent
-%{__cp} -p %{_datadir}/qemu-kvm/qemu-ga-win32/* guest-agent
-unix2dos guest-agent/*.txt
+%{__mv} %{qemu_ga_win_build} guest-agent
 /usr/bin/mkisofs -m drivers -o %{name}-%{version}.iso -r -J \
   -input-charset iso8859-1 -V "%{name}-%{version}" .
 
@@ -51,6 +45,7 @@ unix2dos guest-agent/*.txt
 %{__ln_s} %{name}-%{version}_amd64.vfd %{buildroot}%{_datadir}/%{name}/%{name}_amd64.vfd
 
 %{__cp} -a drivers %{buildroot}/%{_datadir}/%{name}
+%{__cp} -a guest-agent %{buildroot}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -63,8 +58,14 @@ unix2dos guest-agent/*.txt
 %{_datadir}/%{name}/%{name}.iso
 %{_datadir}/%{name}/*.vfd
 %{_datadir}/%{name}/drivers
+%{_datadir}/%{name}/guest-agent
 
 %changelog
+* Tue Oct 29 2013 Mike Bonnet <mikeb@redhat.com> - 1.6.7-1
+- Update to the latest version of the drivers
+- Add qemu-ga installers to the .iso
+- Resolves: rhbz#1018649 rhbz#1018652 rhbz#908609
+
 * Thu Aug 15 2013 Jay Greguske <jgregusk@redhat.com> 1.6.6-1
 - Resolves: 968050