[Spice-devel] [NSIS] 3 patches

[Yedidyah Bar David]

On Mon, Jan 23, 2017 at 5:23 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> Hey,
>
> On Mon, Jan 23, 2017 at 12:08:46PM +0200, Yedidyah Bar David wrote:
>> Hi all,
>>
>> I now posted here 3 patches. First two were posted by Christophe a few
>> weeks ago, and I amended them a bit, last is to add virtio-rng.
>
> Some details about what you "amended a bit" would have been useful ;)

Indeed.

> Also, since you sent the virtio-rng patch 3 times, using the -v option
> to git-send-email would be useful so that it's easier to know which one
> is the latest.

'-v'?

Can't find such an option in the manpage.

Passing it didn't fail it, but the output was identical.

Anyway, I now posted again the three patches.

Differences between yours [1] and current [2][3]:

% git diff 3b764bf d9d42c0
diff --git a/ovirt-guest-tools-iso.spec.in b/ovirt-guest-tools-iso.spec.in
index 0cd6e09..21e8bad 100644
--- a/ovirt-guest-tools-iso.spec.in
+++ b/ovirt-guest-tools-iso.spec.in
@@ -16,7 +16,7 @@ Packager:     Lev Veyde <lveyde at redhat.com>

 BuildRequires: genisoimage
 BuildRequires: rsync
-BuildRequires: mingw32-nsis >= 2.46
+BuildRequires: mingw32-nsis >= 3.01

 # Drop these when virtio-win includes the drivers not inside an iso.
 # See comment in Makefile.
@@ -31,7 +31,7 @@ BuildRequires:        mingw64-spice-vdagent >= 0.7.3
 # From http://resources.ovirt.org/pub
 BuildRequires: ovirt-guest-agent-windows
 BuildRequires: vcredist-x86
-BuildRequires: nsis-simple-service-plugin
+BuildRequires: nsis-simple-service-plugin >= 1.30-2

 # From https://fedoraproject.org/wiki/Windows_Virtio_Drivers#Yum.7CDnf_Repo
 BuildRequires: virtio-win

% git diff 3883c97 564450a
diff --git a/ovirt-guest-tools-iso.spec.in b/ovirt-guest-tools-iso.spec.in
index 0cd6e09..e51dea9 100644
--- a/ovirt-guest-tools-iso.spec.in
+++ b/ovirt-guest-tools-iso.spec.in
@@ -16,7 +16,7 @@ Packager:     Lev Veyde <lveyde at redhat.com>

 BuildRequires: genisoimage
 BuildRequires: rsync
-BuildRequires: mingw32-nsis >= 2.46
+BuildRequires: mingw32-nsis >= 3.01

 # Drop these when virtio-win includes the drivers not inside an iso.
 # See comment in Makefile.
@@ -24,14 +24,14 @@ BuildRequires:      p7zip
 BuildRequires: p7zip-plugins
 BuildRequires: hardlink

-# From http://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/
-BuildRequires: mingw32-spice-vdagent >= 0.7.3
-BuildRequires: mingw64-spice-vdagent >= 0.7.3
+# From http://www.spice-space.org/download/windows/vdagent/vdagent-win-0.8.0/
+BuildRequires: mingw32-spice-vdagent >= 0.8.0
+BuildRequires: mingw64-spice-vdagent >= 0.8.0

 # From http://resources.ovirt.org/pub
 BuildRequires: ovirt-guest-agent-windows
 BuildRequires: vcredist-x86
-BuildRequires: nsis-simple-service-plugin
+BuildRequires: nsis-simple-service-plugin >= 1.30-2

 # From https://fedoraproject.org/wiki/Windows_Virtio_Drivers#Yum.7CDnf_Repo
 BuildRequires: virtio-win
diff --git a/version.txt b/version.txt
index c611bc2..27f16cf 100644
--- a/version.txt
+++ b/version.txt
@@ -1,3 +1,3 @@
-virtio-win 0.1-100
+virtio-win 0.1-126
 QXL 0.1-21
-mingw-vdagent-win 0.7.3
+mingw-vdagent-win 0.8.0

Best,

[1] https://cgit.freedesktop.org/~teuf/spice-nsis/log/
[2] https://gitlab.com/spice/spice-nsis/merge_requests/2
[3] https://gerrit.ovirt.org/#/q/project:ovirt-wgt+status:open
-- 
Didi