From 45984da58eeda0acd09d09e2eaf410a8bea5237f Mon Sep 17 00:00:00 2001 From: mikeb Date: Tue, 21 Jul 2009 19:37:34 +0000 Subject: [PATCH] - package the WHQL-signed drivers - backport the license fixes to the older source tarball, corresponding to the version of the drivers that got signed Resolves: rhbz#510046 rhbz#510431 rhbz#511249 rhbz#512568 --- .cvsignore | 3 +++ sources | 17 ++++++++++------- virtio-win.spec | 9 +++++---- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 04a2abe..a19ae08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,6 @@ virtio-win-1.0.0-31383.tar.bz2 virtio-win-31383-package.log virtio-win-31383-build.log virtio-win-1.0.0-31383-bin.tar.bz2 +virtio-win-1.0.0-31351.1.tar.bz2 +virtio-win-1.0.0-31351-bin-whql.tar.bz2 +virtio-win-31351-package-whql.log diff --git a/sources b/sources index 896bab2..e062ce2 100644 --- a/sources +++ b/sources @@ -1,7 +1,10 @@ -620a66ef86a4ae4fb0082080136cae46 VirtIOPDBs.zip -c646ce55f257e08a7562245354624032 viostorPDBs.zip -d850df83de2e411c3923b8245301374f virtio-win-1.0.0-31383-prewhql.zip -3d9ee493d0ac4edeba18ca17f73b337d virtio-win-1.0.0-31383.tar.bz2 -fd9dda5e3414d318efd1345b38ddd9be virtio-win-31383-package.log -04e5b9560167960460359de74eb569b1 virtio-win-31383-build.log -d7c09364b4d7357daa827ff173c77ffd virtio-win-1.0.0-31383-bin.tar.bz2 +703ff2b8ccec77bb0824578391598dd9 virtio-win-1.0.0-31351-build.log +79841853348df0b6a186a0d603750006 VirtIOPDBs.zip +c32c44065e0b67234142341055dc6214 viostorPDBs.zip +65461c5590e3980264620e985dc69b44 virtio-win-1.0.0-31351-prewhql.zip +4344d43326dc753560b9f59614524a1f virtio-win-1.0.0-31351.tar.bz2 +d886a2130a490dc5b781a615e0463917 virtio-win-1.0.0-31351-bin.tar.bz2 +5d4cd1869ec7b99fabc9b57a20dc1d89 virtio-win-1.0.0-31351-package.log +0e44ad66a09d4ecf973f9a1b2a90a9dc virtio-win-1.0.0-31351.1.tar.bz2 +58ff068f16f0b47858ea7d2de1ec6dd6 virtio-win-1.0.0-31351-bin-whql.tar.bz2 +21e962b6a5f2ec9776d5fa992a72626a virtio-win-31351-package-whql.log diff --git a/virtio-win.spec b/virtio-win.spec index 64b9d90..5433e84 100644 --- a/virtio-win.spec +++ b/virtio-win.spec @@ -1,4 +1,4 @@ -%global svnnum 31383 +%global svnnum 31351 Summary: VirtIO para-virtualized drivers for Windows(R) Name: virtio-win @@ -7,8 +7,8 @@ Release: 2.%{svnnum}%{?dist} License: GPLv2 and Microsoft Proprietary Group: Applications/System URL: http://www.redhat.com/ -Source0: %{name}-%{version}-%{svnnum}.tar.bz2 -Source1: %{name}-%{version}-%{svnnum}-bin.tar.bz2 +Source0: %{name}-%{version}-%{svnnum}.1.tar.bz2 +Source1: %{name}-%{version}-%{svnnum}-bin-whql.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: /usr/bin/mkisofs @@ -51,8 +51,9 @@ done %{_datadir}/%{name}/*.vfd %changelog -* Thu Jun 18 2009 Jay Greguske - 1.0.0-1.31383 +* Thu Jun 18 2009 Jay Greguske - 1.0.0-2.31351 - Fixed licensing issue in source tarball + * Wed Jun 17 2009 Mike Bonnet - 1.0.0-1.31351 - rebuild from the latest upstream sources