[firmware-addon-dell] Patch to fix 688046

[Praveen K Paladugu]

commit 6e67bbe889593a6be6853ca91d9901e5472a73c0
Author: praveenp <praveen_paladugu at dell.com>
Date:   Fri Jun 24 09:01:11 2011 -0500

    Patch to fix 688046

 firmware-addon-dell.spec               |    8 +++++++-
 replace_wineprefix_with_wineboot.patch |   17 +++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/firmware-addon-dell.spec b/firmware-addon-dell.spec
index 7374812..ba281cf 100644
--- a/firmware-addon-dell.spec
+++ b/firmware-addon-dell.spec
@@ -28,7 +28,7 @@
 
 Name:           firmware-addon-dell
 Version:        %{release_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A firmware-tools plugin to handle BIOS/Firmware for Dell systems
 
 Group:          Applications/System
@@ -36,6 +36,7 @@ License:        GPLv2+ or OSL 2.1
 URL:            http://linux.dell.com/libsmbios/download/
 Source0:        http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         replace_wineprefix_with_wineboot.patch
 
 # Dell only sells Intel-compat systems, so this package doesnt make much sense
 # on, eg. PPC.  Also, we rely on libsmbios, which is only avail on Intel-compat
@@ -55,6 +56,7 @@ applicable to most Dell systems.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -100,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 24 2011 Praveen K Paladugu <praveen_paladugu at dell.com>
+- Added a patch to fix BZ#688046.This patch uses wineboot when available and falls back to legacy winprefixcreate if not.
+
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/replace_wineprefix_with_wineboot.patch b/replace_wineprefix_with_wineboot.patch
new file mode 100644
index 0000000..f81398f
--- /dev/null
+++ b/replace_wineprefix_with_wineboot.patch
@@ -0,0 +1,17 @@
+diff -up firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py.orig firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py
+--- firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py.orig	2011-06-22 17:00:47.000000000 -0500
++++ firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py	2011-06-22 17:02:44.000000000 -0500
+@@ -189,7 +189,12 @@ def setupWine():
+         "HOME":os.environ["HOME"],
+         "WINEPREFIX": wineprefix,
+         }
+-    common.loggedCmd(["wineprefixcreate", "-w", "--prefix", wineprefix], cwd=wineprefix, env=env, logger=getLog(), raiseExc=False)
++    if os.path.exists('/usr/bin/wineboot'):
++        cmd = ["wineboot", "-u"]
++    elif os.path.exists('/usr/bin/wineprefixcreate'):
++        cmd = ["wineprefixcreate", "-w", "--prefix", wineprefix]
++    common.loggedCmd(cmd, cwd=wineprefix, env=env, logger=getLog(), raiseExc=False)
++
+     atexit.register(shutil.rmtree, wineprefix)
+     getLog(prefix="verbose.").info("Wine pre-setup finished.")
+