diff --git a/wine-0.9.53.tar.bz2 b/wine-0.9.53.tar.bz2
deleted file mode 100644
index ca70ad9..0000000
--- a/wine-0.9.53.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:052549e8c1fa5a56f3e11406889e09f4cbc0d4699c21a71bbe8c4de23a9a1fdd
-size 13003901
diff --git a/wine-0.9.54.tar.bz2 b/wine-0.9.54.tar.bz2
new file mode 100644
index 0000000..6e48569
--- /dev/null
+++ b/wine-0.9.54.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b2ba6a671cd85f30def4b189e10a26ae22fda2e4e13db0a0702db73d95bcf95
+size 13119230
diff --git a/wine.changes b/wine.changes
index 1666c56..c8e61ca 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Jan 25 19:13:22 CET 2008 - meissner@suse.de
+
+- Upgraded to upstream 0.9.54
+  - Photoshop CS/CS2 should now work, please help us testing it.
+    See http://wiki.winehq.org/AdobePhotoshop for details.
+  - A number of RPC fixes.
+  - Various improvements to the debugger support.
+  - Lots of bug fixes.
+- Updated winetricks
+  - added mdac25, riched20, xvid, ffdshow, vcrun2005sp1, vcrun2008
+  - new pseudo packages: allfonts, allvcodecs
+  - mono12 now links to 1.2.6
+
 -------------------------------------------------------------------
 Sat Jan 12 09:59:17 CET 2008 - meissner@suse.de
 
diff --git a/wine.spec b/wine.spec
index 98fa808..907e07c 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package wine (Version 0.9.53)
+# spec file for package wine (Version 0.9.54)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@ BuildRequires:  alsa-devel audiofile bison capi4linux-devel cups-devel desktop-f
 License:        LGPL v2.1 or later
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        0.9.53
+Version:        0.9.54
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -118,21 +118,32 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/aclocal/wine.m4
 
 %changelog
-* Sat Jan 12 2008 - meissner@suse.de
+* Fri Jan 25 2008 meissner@suse.de
+- Upgraded to upstream 0.9.54
+  - Photoshop CS/CS2 should now work, please help us testing it.
+  See http://wiki.winehq.org/AdobePhotoshop for details.
+  - A number of RPC fixes.
+  - Various improvements to the debugger support.
+  - Lots of bug fixes.
+- Updated winetricks
+  - added mdac25, riched20, xvid, ffdshow, vcrun2005sp1, vcrun2008
+  - new pseudo packages: allfonts, allvcodecs
+  - mono12 now links to 1.2.6
+* Sat Jan 12 2008 meissner@suse.de
 - Upgraded to upstream 0.9.53
   - RunOnce and Run entries now executed on startup.
   - Beginnings of support for emulated disk devices.
   - Many Richedit improvements.
   - Nicer looking color dialog.
   - Lots of bug fixes.
-* Sat Dec 29 2007 - meissner@suse.de
+* Sat Dec 29 2007 meissner@suse.de
 - Upgraded to upstream 0.9.52
   - Improved graphics tablet support.
   - Support for RPC context handles.
   - Fixes for some longstanding screen depth issues.
   - Implementation of "My Network Places" shell folder.
   - Lots of bug fixes.
-* Fri Dec 14 2007 - meissner@suse.de
+* Fri Dec 14 2007 meissner@suse.de
 - Upgraded to upstream 0.9.51
   - A bunch of WinHelp improvements.
   - Better Japanese font support.
@@ -147,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
   - Lots of bug fixes.
 - Updated winetricks
   - some mono 1.2 fixes
-* Sat Nov 10 2007 - meissner@suse.de
+* Sat Nov 10 2007 meissner@suse.de
 - Upgraded to upstream 0.9.49:
   - Many copy protection fixes.
   - GLSL is now the default for Direct3D.
@@ -155,21 +166,21 @@ rm -rf $RPM_BUILD_ROOT
   - Support for TOPMOST windows.
   - Beginnings of an inetcomm dll implementation.
   - Lots of bug fixes.
-* Wed Oct 31 2007 - ro@suse.de
+* Wed Oct 31 2007 ro@suse.de
 - include assert.h for alsa source
-* Fri Oct 26 2007 - meissner@suse.de
+* Fri Oct 26 2007 meissner@suse.de
 - Upgraded to upstream 0.9.48:
   - Still more fixes for regression test failures.
   - Much more complete cryptnet implementation.
   - WIDL is now able to generate the oleaut32 proxy code.
   - Lots of bug fixes.
-* Fri Oct 12 2007 - meissner@suse.de
+* Fri Oct 12 2007 meissner@suse.de
 - Upgraded to upstream 0.9.47:
   - New scheme for OpenGL support in child windows.
   - Lots of fixes for regression test failures.
   - A Tahoma replacement font.
   - Lots of bug fixes.
-* Sun Sep 30 2007 - meissner@suse.de
+* Sun Sep 30 2007 meissner@suse.de
 - Upgraded to upstream 0.9.46:
   - A variety of fixes to improve Photoshop CS2 support.
   - More complete support for device installation in setupapi.
@@ -182,7 +193,7 @@ rm -rf $RPM_BUILD_ROOT
   - A number of fixes to sound support.
   - Many more WordPad features.
 - New winetricks version
-* Fri Aug 24 2007 - meissner@suse.de
+* Fri Aug 24 2007 meissner@suse.de
 - Upgraded to upstream 0.9.44:
   - Better heuristics for making windows managed.
   - Automatic detection of timezone parameters.
@@ -196,14 +207,14 @@ rm -rf $RPM_BUILD_ROOT
   - Note a few downloads are no longer available (replacements, anyone?)
   - Note mono11 is deprecated
   - Add Mikolaj's nifty fakeie changes
-* Fri Aug 10 2007 - meissner@suse.de
+* Fri Aug 10 2007 meissner@suse.de
 - Upgraded to upstream 0.9.43:
   - Direct3D support on top of WGL instead of GLX for better portability.
   - Many DirectSound fixes.
   - Still more gdiplus functions.
   - Many crypt32 improvements.
   - Lots of bug fixes.
-* Mon Jul 30 2007 - meissner@suse.de
+* Mon Jul 30 2007 meissner@suse.de
 - Upgraded to upstream 0.9.42:
   - Support for activation contexts and side-by-side assemblies.
   - Many more gdiplus functions.
@@ -211,23 +222,23 @@ rm -rf $RPM_BUILD_ROOT
   - Many HTTP protocol handling fixes.
   - Lots of bug fixes.
 - updated README a bit
-* Mon Jul 16 2007 - meissner@suse.de
+* Mon Jul 16 2007 meissner@suse.de
 - Upgraded to upstream 0.9.41:
   - A number of gdiplus functions.
   - More complete pdh.dll implementation.
   - Support for MSI remote calls.
   - Messaging support in crypt32.dll.
   - Lots of bug fixes.
-* Wed Jul 04 2007 - meissner@suse.de
+* Wed Jul 04 2007 meissner@suse.de
 - Upgraded to upstream 0.9.40:
   - Many MSHTML improvements.
   - A few more sound fixes.
   - Many Direct3D fixes.
   - Lots of bug fixes.
 - added some more buildrequires for splitted packages
-* Sat Jun 23 2007 - meissner@suse.de
+* Sat Jun 23 2007 meissner@suse.de
 - run fdupes, fixup desktop file to be more compliant.
-* Fri Jun 15 2007 - meissner@suse.de
+* Fri Jun 15 2007 meissner@suse.de
 - Upgraded to upstream 0.9.39:
   - Many MSHTML improvements.
   - Several improvements to the sound support.
@@ -235,7 +246,7 @@ rm -rf $RPM_BUILD_ROOT
   - Several new supported constructs in the IDL compiler.
   - Many Direct3D threading fixes.
   - Lots of bug fixes.
-* Sat Jun 02 2007 - meissner@suse.de
+* Sat Jun 02 2007 meissner@suse.de
 - Upgraded to upstream 0.9.38:
   - Beginnings of support for copy protection kernel drivers.
   - More MSI automation support.
@@ -243,16 +254,16 @@ rm -rf $RPM_BUILD_ROOT
   - A number of OLE fixes.
   - Lots of bug fixes.
 - Added "winetricks" script from Dan Kegel.
-* Fri May 11 2007 - meissner@suse.de
+* Fri May 11 2007 meissner@suse.de
 - Upgraded to upstream 0.9.37:
   - MSI automation with JScript/VBScript support.
   - Various MSHTML improvements.
   - The usual assortment of Direct3D fixes.
   - Support for a few more exe protection schemes.
   - Lots of bug fixes.
-* Mon May 07 2007 - meissner@suse.de
+* Mon May 07 2007 meissner@suse.de
 - removed duplicate Icon= line.
-* Sun Apr 29 2007 - meissner@suse.de
+* Sun Apr 29 2007 meissner@suse.de
 - Upgraded to upstream 0.9.36:
   - Midi support in the CoreAudio driver.
   - Mixer support in the Alsa driver.
@@ -260,7 +271,7 @@ rm -rf $RPM_BUILD_ROOT
   - Implementation for most D3DRM functions.
   - The usual assortment of Direct3D fixes.
   - Lots of bug fixes.
-* Fri Apr 13 2007 - meissner@suse.de
+* Fri Apr 13 2007 meissner@suse.de
 - Upgraded to upstream 0.9.35:
   - Broken aRts sound driver now removed for good.
   - Many fixes to the Quartz DLL sound support.
@@ -272,9 +283,9 @@ rm -rf $RPM_BUILD_ROOT
   - A range of fixes for various installers.
   - New builtin xcopy tool.
   - Lots of bug fixes.
-* Fri Mar 30 2007 - meissner@suse.de
+* Fri Mar 30 2007 meissner@suse.de
 - buildrequires bison,flex,ncurses-devel
-* Sat Mar 17 2007 - meissner@suse.de
+* Sat Mar 17 2007 meissner@suse.de
 - Upgraded to upstream 0.9.33:
   - Many Direct3D fixes and performance improvements.
   - More comctl32 tests and some bug fixes.
@@ -282,40 +293,40 @@ rm -rf $RPM_BUILD_ROOT
   - Still more fixes to builtin OLE.
   - Support for process control on Solaris.
   - Lots of bug fixes.
-* Sat Mar 03 2007 - meissner@suse.de
+* Sat Mar 03 2007 meissner@suse.de
 - Upgraded to upstream 0.9.32:
   - Many Direct3D fixes and performance improvements.
   - Several new features in the builtin cmd.exe.
   - Improvements to HTML help support.
   - Lots of bug fixes.
-* Tue Feb 20 2007 - meissner@suse.de
+* Tue Feb 20 2007 meissner@suse.de
 - Upgraded to upstream 0.9.31:
   - Many Direct3D fixes and performance improvements.
   - Several new comctl32 test cases.
   - IDL compiler improvements.
   - More OLE32 marshalling fixes.
   - Lots of bug fixes.
-* Thu Jan 25 2007 - meissner@suse.de
+* Thu Jan 25 2007 meissner@suse.de
 - Upgraded to upstream 0.9.30:
   - Many improvements to Direct3D shaders and state management.
   - Support for inter-process memory allocations.
   - OLE32 marshalling fixes.
   - Lots of bug fixes.
-* Wed Jan 10 2007 - meissner@suse.de
+* Wed Jan 10 2007 meissner@suse.de
 - Upgraded to upstream 0.9.29:
   - More work on the new Direct3D state management.
   - Debugger support for Mac OS.
   - Many OLE fixes and improvements.
   - Audio input support on Mac OS.
   - Lots of bug fixes.
-* Thu Jan 04 2007 - meissner@suse.de
+* Thu Jan 04 2007 meissner@suse.de
 - Upgraded to upstream 0.9.28:
   - OpenGL in child windows should work again.
   - Better mouse support in games.
   - Beginnings of new state management in Direct3D.
   - Improved audio and font support on Mac OS.
   - Lots of bug fixes.
-* Sat Dec 09 2006 - meissner@suse.de
+* Sat Dec 09 2006 meissner@suse.de
 - removed labels.patch
 - Upgraded to upstream 0.9.27:
   - Better support for noexec kernels.
@@ -323,7 +334,7 @@ rm -rf $RPM_BUILD_ROOT
   - Several Winsock fixes.
   - Various code cleanups.
   - Lots of bug fixes.
-* Fri Dec 08 2006 - meissner@suse.de
+* Fri Dec 08 2006 meissner@suse.de
 - Upgraded to upstream 0.9.26:
   - Better support for Unix locale settings.
   - Improved X11 keyboard support.
@@ -334,9 +345,9 @@ rm -rf $RPM_BUILD_ROOT
   - Many MSHTML improvements.
   - Support for NTLMv2.
   - RPC over TCP improvements.
-* Sat Nov 25 2006 - meissner@suse.de
+* Sat Nov 25 2006 meissner@suse.de
 - handle labels with spaces inside during setup of prefix #223681
-* Fri Oct 27 2006 - meissner@suse.de
+* Fri Oct 27 2006 meissner@suse.de
 - buildrequires libgphoto2-devel
 - Upstream 0.9.24:
   - Support for multiple monitors using Xinerama.
@@ -344,13 +355,13 @@ rm -rf $RPM_BUILD_ROOT
   - A ton of memory leaks fixed.
   - Many common controls fixes.
   - Lots of bug fixes.
-* Mon Oct 16 2006 - meissner@suse.de
+* Mon Oct 16 2006 meissner@suse.de
 - Upstream 0.9.23:
   - Massive update of printf formats for Win64 compatibility.
   - Dynamic drive support on MacOSX.
   - Still more MSI fixes and improvements.
   - Lots of bug fixes.
-* Thu Sep 28 2006 - meissner@suse.de
+* Thu Sep 28 2006 meissner@suse.de
 - Upstream 0.9.22:
   - The usual assortment of MSI improvements.
   - Several bug fixes to the various common controls.
@@ -358,7 +369,7 @@ rm -rf $RPM_BUILD_ROOT
   - Various improvements to the build process.
   - Many translation updates.
   - Lots of bug fixes.
-* Thu Sep 14 2006 - meissner@suse.de
+* Thu Sep 14 2006 meissner@suse.de
 - Upstream 0.9.21:
   - OpenGL restructurations.
   - The usual assortment of MSI improvements.
@@ -369,7 +380,7 @@ rm -rf $RPM_BUILD_ROOT
   - Lots of bug fixes.
 - Merged my local patch into tarball, dropped
   some no longer necessary old stuff.
-* Thu Aug 24 2006 - meissner@suse.de
+* Thu Aug 24 2006 meissner@suse.de
 - Upstream 0.9.20:
   - XEmbed system tray support.
   - Many improvements to NTLM support.
@@ -379,7 +390,7 @@ rm -rf $RPM_BUILD_ROOT
   - Lots of bug fixes.
 - Switched back to OSS by default. ALSA causes hangs
   in DirectSound :(
-* Mon Aug 14 2006 - meissner@suse.de
+* Mon Aug 14 2006 meissner@suse.de
 - Upstream 0.9.19:
   - Support for a proper Trash folder.
   - Many improvements to the IDL compiler.
@@ -387,7 +398,7 @@ rm -rf $RPM_BUILD_ROOT
   - A number of MSI bug fixes.
   - Many RichEdit improvements.
   - Lots of bug fixes.
-* Fri Jul 28 2006 - meissner@suse.de
+* Fri Jul 28 2006 meissner@suse.de
 - Upstream, 0.9.18:
   - Still more work on Direct3D.
   - A lot of MSI bug fixes and improvements.
@@ -395,7 +406,7 @@ rm -rf $RPM_BUILD_ROOT
   - Several fixes for Win64 support.
   - Some performance improvements.
   - Lots of bug fixes.
-* Thu Jul 13 2006 - meissner@suse.de
+* Thu Jul 13 2006 meissner@suse.de
 - Upstream 0.9.17:
   - Still more work on Direct3D shaders.
   - Now using the Gecko engine directly for MSHTML.
@@ -409,20 +420,20 @@ rm -rf $RPM_BUILD_ROOT
   - Beginnings of an OleView Winelib application.
   - Lots of bug fixes.
 - personality patch no longer necessary.
-* Thu Jun 08 2006 - meissner@suse.de
+* Thu Jun 08 2006 meissner@suse.de
 - Upstream 0.9.15:
   - More MS/RPC improvements.
   - Core Audio driver for Mac OS X.
   - More complete DNSAPI dll.
   - Improvements to Web browser support.
   - Lots of bug fixes.
-* Thu May 25 2006 - meissner@suse.de
+* Thu May 25 2006 meissner@suse.de
 - Upstream 0.9.14
   - Better MS/RPC compatibility.
   - Many fixes to Direct3D shaders.
   - Several improvements to the header control.
   - Lots of bug fixes.
-* Mon May 15 2006 - meissner@suse.de
+* Mon May 15 2006 meissner@suse.de
 - Upstream 0.9.13
   - New GPhoto backend for TWAIN.
   - Dynamic drive configuration using HAL.
@@ -431,7 +442,7 @@ rm -rf $RPM_BUILD_ROOT
   - Lots of bug fixes.
 - Added libgphoto2 and hal development libs to BuildRequires.
 - personality hack to avoid virtual ram ulimits now seperate.
-* Mon Apr 17 2006 - meissner@suse.de
+* Mon Apr 17 2006 meissner@suse.de
 - Upstream 0.9.12:
   - New Winelib Internet Explorer application (all 5 lines of it).
   - Several improvements to the font support.
@@ -439,7 +450,7 @@ rm -rf $RPM_BUILD_ROOT
   - Faster drawing of the cards in Solitaire (very important feature).
   - A number of fixes for issues found by the Coverity code cheker.
   - Lots of bug fixes.
-* Tue Apr 11 2006 - meissner@suse.de
+* Tue Apr 11 2006 meissner@suse.de
 - upstream 0.9.11:
   - Fake dll files created in the system directory to help installers.
   - Desktop mode now properly supports multiple processes.
@@ -483,25 +494,25 @@ rm -rf $RPM_BUILD_ROOT
   - Many static control improvements.
   - Some fixes for copy protection support.
   - Lots of bug fixes.
-* Fri Mar 17 2006 - meissner@suse.de
+* Fri Mar 17 2006 meissner@suse.de
 - Avoid ulimit leading to out of memory situations by using
   the compat address space layout personality. #152115
-* Fri Mar 17 2006 - meissner@suse.de
+* Fri Mar 17 2006 meissner@suse.de
 - Select ALSA by default. #158424
-* Mon Feb 06 2006 - meissner@suse.de
+* Mon Feb 06 2006 meissner@suse.de
 - Handle empty /media/ gracefully. #148351
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Mon Jan 23 2006 - meissner@suse.de
+* Mon Jan 23 2006 meissner@suse.de
 - fixed WMF explpoit here too.
-* Mon Jan 09 2006 - meissner@suse.de
+* Mon Jan 09 2006 meissner@suse.de
 - backport patch from CVS that fixes hang with installshield 6 installers.
-* Wed Jan 04 2006 - meissner@suse.de
+* Wed Jan 04 2006 meissner@suse.de
 - Upgraded to 0.9.5 release:
   - A number of MSI fixes.
   - More improvements to the IDL compiler.
   - Lots of bug fixes.
-* Wed Dec 28 2005 - meissner@suse.de
+* Wed Dec 28 2005 meissner@suse.de
 - Upgraded to 0.9.4 release:
   - Improvements to the IDL compiler.
   - Some infrastructure work for loadable driver support.
@@ -512,7 +523,7 @@ rm -rf $RPM_BUILD_ROOT
   - Relay traces now work on NX platforms.
   - Lots of bug fixes.
 - tcl,tcl-devel not neededforbuild.
-* Thu Dec 08 2005 - meissner@suse.de
+* Thu Dec 08 2005 meissner@suse.de
 - Upgraded to 0.9.3 release:
   - Many marshalling fixes in rpcrt4.
   - Various OLE improvements and fixes.
@@ -522,7 +533,7 @@ rm -rf $RPM_BUILD_ROOT
   - More dbghelp APIs implemented.
   - Directory objects in wineserver.
   - Lots of bug fixes.
-* Tue Nov 22 2005 - meissner@suse.de
+* Tue Nov 22 2005 meissner@suse.de
 - Upgraded to 0.9.2 release:
   - Winelib Explorer app (just a wrapper around winefile for now).
   - Debugger cleanups and improvements.
@@ -530,7 +541,7 @@ rm -rf $RPM_BUILD_ROOT
   - Better autogenerated API manpages.
   - A bunch of Korean translations.
   - Lots of bug fixes.
-* Fri Nov 11 2005 - meissner@suse.de
+* Fri Nov 11 2005 meissner@suse.de
 - Upgraded to 0.9.1 release:
   - Support for Find function in regedit.
   - Winelib app to eject a CD.
@@ -538,9 +549,9 @@ rm -rf $RPM_BUILD_ROOT
   - Better support for running text-mode apps without X.
   - Improved support for various code obfuscation tools.
   - Lots of bug fixes.
-* Tue Oct 25 2005 - meissner@suse.de
+* Tue Oct 25 2005 meissner@suse.de
 - Upgraded to 0.9 release (first BETA release).
-* Fri Sep 30 2005 - meissner@suse.de
+* Fri Sep 30 2005 meissner@suse.de
 - upgraded to 20050930 release:
         - Joystick force feedback support.
         - Beginnings of Win64 support.
@@ -549,9 +560,9 @@ rm -rf $RPM_BUILD_ROOT
         - Several OLE fixes.
         - Some fixes for MacOS/x86.
         - Lots of bug fixes.
-* Sun Sep 25 2005 - meissner@suse.de
+* Sun Sep 25 2005 meissner@suse.de
 - fixed deprecated LDAP stuff.
-* Fri Sep 16 2005 - meissner@suse.de
+* Fri Sep 16 2005 meissner@suse.de
 - added pkgconfig, prelink to nfb
 - Upgraded to 20050830 release:
         - A lot more theming support.
@@ -562,9 +573,9 @@ rm -rf $RPM_BUILD_ROOT
         - Emulated version now set to Windows 2000 by default.
         - Direct3D fixes and improvements.
         - Lots of bug fixes.
-* Sun Aug 07 2005 - meissner@suse.de
+* Sun Aug 07 2005 meissner@suse.de
 - fixed build with new fontforge.
-* Sat Jul 30 2005 - meissner@suse.de
+* Sat Jul 30 2005 meissner@suse.de
 - Upgraded to final 20050725 release:
         - Beginnings of theme support in common controls.
         - Many MSHTML improvements.
@@ -573,13 +584,13 @@ rm -rf $RPM_BUILD_ROOT
         - Beginnings of LDAP support.
         - Various cleanups after removal of the config file.
         - Lots of bug fixes.
-* Fri Jul 22 2005 - meissner@suse.de
+* Fri Jul 22 2005 meissner@suse.de
 - upgraded to current CVS
 	- InstallShield installers in general now works!
 	- some 16bit fixes for old 16bit OLE using programs.
 	- lots of other bugfixes.
 - disabled one msacm codec.
-* Wed Jun 29 2005 - meissner@suse.de
+* Wed Jun 29 2005 meissner@suse.de
 - Upgraded to 20050628 release:
         - Configuration settings moved to the registry.
         - Graphical Wine configuration tool is now enabled.
@@ -588,9 +599,9 @@ rm -rf $RPM_BUILD_ROOT
         - Initial support for webcams.
         - Lots of bug fixes.
 - No more ~/.wine/config file, all in the registry now.
-* Fri Jun 17 2005 - meissner@suse.de
+* Fri Jun 17 2005 meissner@suse.de
 - fixed a detected buffer overflow.
-* Mon May 30 2005 - meissner@suse.de
+* Mon May 30 2005 meissner@suse.de
 - Upgraded to 20050524 release:
         - Many MSI improvements.
         - More features in the file manager.
@@ -598,11 +609,11 @@ rm -rf $RPM_BUILD_ROOT
         - SGML documentation moved out of the source tree.
         - Header files cleanups.
         - Lots of bug fixes.
-* Wed May 18 2005 - ro@suse.de
+* Wed May 18 2005 ro@suse.de
 - fix build with most recent alsa includes
-* Thu Apr 28 2005 - meissner@suse.de
+* Thu Apr 28 2005 meissner@suse.de
 - fixed buffer overflows.
-* Wed Apr 20 2005 - meissner@suse.de
+* Wed Apr 20 2005 meissner@suse.de
 - Upgraded to 20050419 release.
         - Mailslot support.
         - Support for side mouse buttons (X buttons).
@@ -610,7 +621,7 @@ rm -rf $RPM_BUILD_ROOT
         - Loading of Windows registry files disabled for now.
         - Many code cleanups.
         - Lots of bug fixes.
-* Wed Apr 13 2005 - meissner@suse.de
+* Wed Apr 13 2005 meissner@suse.de
 - Upgraded to 20050310 release.
         - Initial implementation of a true Richedit control.
         - Shell extension for browsing Unix directories.
@@ -621,10 +632,10 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to CVS head branch.
 - Reenabled mp3.
 - Fixed gcc4 problems.
-* Mon Feb 21 2005 - meissner@suse.de
+* Mon Feb 21 2005 meissner@suse.de
 - add desktop-file-utils and glib2 to neededforbuild, since
   update-desktop-database is called.
-* Mon Feb 14 2005 - meissner@suse.de
+* Mon Feb 14 2005 meissner@suse.de
 - Upgraded to 20050211 release:
         - Still more work on the MSI dll.
         - More OLE work, including a builtin stdole32.tlb.
@@ -632,9 +643,9 @@ rm -rf $RPM_BUILD_ROOT
         - Lots of bug fixes.
 - Includes bugfix for 2.6.11 kernels with NX mapping.
 - stdole32.tlb still included.
-* Wed Jan 19 2005 - meissner@suse.de
+* Wed Jan 19 2005 meissner@suse.de
 - Fixed README.SuSE
-* Wed Jan 12 2005 - meissner@suse.de
+* Wed Jan 12 2005 meissner@suse.de
 - Upgraded to 2005011 release:
         - Many OLE bug fixes and improvements.
         - A lot more work on the MSI dll.
@@ -643,7 +654,7 @@ rm -rf $RPM_BUILD_ROOT
         - Many janitorial cleanups.
         - Lots of bug fixes.
 - No hard dependency on libcapi.so.20 anymore.
-* Thu Dec 02 2004 - meissner@suse.de
+* Thu Dec 02 2004 meissner@suse.de
 - Upgraded to 20041201 release:
         - Implementation of the RSAENH dll.
         - More work on the Direct3D 9 architecture.
@@ -652,9 +663,9 @@ rm -rf $RPM_BUILD_ROOT
         - Lots of bug fixes.
 - Dropped no longer needed call to wineprefixcreate,
   wine now does it itself.
-* Thu Nov 11 2004 - ro@suse.de
+* Thu Nov 11 2004 ro@suse.de
 - fixed file list
-* Wed Oct 20 2004 - meissner@suse.de
+* Wed Oct 20 2004 meissner@suse.de
 - Upgraded to 20041019 release:
         - Beginnings of an architecture for Direct3D 9 support.
         - Many debugger regressions fixed.
@@ -668,10 +679,10 @@ rm -rf $RPM_BUILD_ROOT
         - Lots of bug fixes.
 - Create serial / lpt1 device links in wineprefixcreate.
 - Added liblcms, liblcms-devel and fontforge to neededforbuild.
-* Sun Oct 03 2004 - meissner@suse.de
+* Sun Oct 03 2004 meissner@suse.de
 - Do not output localized floats into the PostScript data
   generated by WINEPS.
-* Tue Sep 28 2004 - meissner@suse.de
+* Tue Sep 28 2004 meissner@suse.de
   FrameMaker 7 fixes:
 - Make menuentries work (by upgrading dlls/shell32/shellpath.c to
   current CVS).
@@ -679,35 +690,35 @@ rm -rf $RPM_BUILD_ROOT
 - Create some additional directories in the fake windows tree required
   by FrameMaker.
 - Fixed creation of "x: -> /tmp", "y: -> $HOME" and CDROM links.
-* Fri Sep 17 2004 - meissner@suse.de
+* Fri Sep 17 2004 meissner@suse.de
 - Detect libgif shared library too, so OLEAUT can load GIF
   images again.
-* Tue Sep 14 2004 - meissner@suse.de
+* Tue Sep 14 2004 meissner@suse.de
 - Make menu entries appear again (fixed icondir handling) #43415
 - Do not use /SuSE/ menu insert, the SuSE menu is no longer.
-* Tue Aug 17 2004 - meissner@suse.de
+* Tue Aug 17 2004 meissner@suse.de
 - Fixed compile with __user.
-* Mon Aug 16 2004 - meissner@suse.de
+* Mon Aug 16 2004 meissner@suse.de
 - Upgraded to 20040813 upstream release:
         - New msiexec application.
         - Support for alpha blending.
         - More sound support improvements.
         - Various code cleanups.
         - Lots of bug fixes.
-* Mon Jul 19 2004 - meissner@suse.de
+* Mon Jul 19 2004 meissner@suse.de
 - Upgraded to 20040716 upstream release:
         - Implementation of the Microsoft Installer dll.
         - Beginnings of proper inter-process window repaints.
         - Several DirectSound improvements.
         - Fixes for the regressions caused by the new filesystem support.
         - Lots of bug fixes.
-* Fri Jun 18 2004 - meissner@suse.de
+* Fri Jun 18 2004 meissner@suse.de
 - Upgraded to 20040615 upstream release:
         - Major winedbg rewrite using the dbghelp dll.
         - New Wine preloader to reserve memory areas at startup.
         - Many improvements to the audio support.
         - Lots of bug fixes.
-* Tue May 11 2004 - meissner@suse.de
+* Tue May 11 2004 meissner@suse.de
 - Upgraded to 20040505 upstream release:
         - Many more filesystem improvements, including autodetection
   of drive types and devices, and support for editing the drive
@@ -716,7 +727,7 @@ rm -rf $RPM_BUILD_ROOT
         - Several fixes to the various sound drivers.
         - Lots of bug fixes.
 - Dropped our own make_fakewindows setup, use wineprefixcreate instead.
-* Tue Apr 20 2004 - meissner@suse.de
+* Tue Apr 20 2004 meissner@suse.de
 - Dropped winesetuptk, it is more and more unhelpful to the
   ongoing wine configuration file changes.
 - Cleaned spec file.
@@ -733,7 +744,7 @@ rm -rf $RPM_BUILD_ROOT
         - New setupapi INF script to create the initial registry.
         - Many improvements to the various multimedia dlls.
         - Lots of bug fixes.
-* Mon Feb 16 2004 - meissner@suse.de
+* Mon Feb 16 2004 meissner@suse.de
 - updated to 20040213 upstream release:
         - Improved support for screen resolution changes.
         - More shell32 improvements.
@@ -742,7 +753,7 @@ rm -rf $RPM_BUILD_ROOT
         - Lots of bug fixes.
 - make_fakewindows now calls regsvr32 for all self registering
   dlls.
-* Thu Jan 22 2004 - meissner@suse.de
+* Thu Jan 22 2004 meissner@suse.de
 - updated to 20040121 upstream release:
         - Many improvements in the shell32 dll.
         - Better support for constructors in C++ Winelib apps.
@@ -752,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT
         - Better support for video playback.
         - Full IME support for Asian locales.
         - Lots of bug fixes.
-* Sun Dec 14 2003 - meissner@suse.de
+* Sun Dec 14 2003 meissner@suse.de
 - removed config-dist.sh
 - reenabled alsa/alsa-devel.
 - updated to 20031212 upstream release:
@@ -763,7 +774,7 @@ rm -rf $RPM_BUILD_ROOT
         - Work around for Exec Shield and prelinking troubles.
         - Many code cleanups.
         - Lots of bug fixes.
-* Thu Nov 20 2003 - meissner@suse.de
+* Thu Nov 20 2003 meissner@suse.de
 - update to 20031118 upstream release
         - Many printing improvements.
         - Run-time detection of NPTL threading.
@@ -772,7 +783,7 @@ rm -rf $RPM_BUILD_ROOT
         - Lots of bug fixes.
 - Added capi4linux, expat requires.
 - Disabled alsa for now due to changed API.
-* Fri Oct 17 2003 - meissner@suse.de
+* Fri Oct 17 2003 meissner@suse.de
 - build as non root
 - Upgraded to latest upstream:
         - Support for the Xrandr extension.
@@ -781,22 +792,22 @@ rm -rf $RPM_BUILD_ROOT
 	- Many improvements to the winecfg configuration tool.
         - Massive header files cleanup for better source compatibility.
         - Lots of bug fixes.
-* Thu Sep 18 2003 - adrian@suse.de
+* Thu Sep 18 2003 adrian@suse.de
 - unbreak build again
-* Thu Sep 18 2003 - adrian@suse.de
+* Thu Sep 18 2003 adrian@suse.de
 - hide menu entry, we need it still for MimeType handling
-* Sun Sep 14 2003 - adrian@suse.de
+* Sun Sep 14 2003 adrian@suse.de
 - include a wine.desktop file with correct Icon= line
-* Fri Sep 12 2003 - meissner@suse.de
+* Fri Sep 12 2003 meissner@suse.de
 - Do not use the greek/symbol font of koffice-wordprocessing
   as default truetype font.
-* Mon Sep 01 2003 - mmj@suse.de
+* Mon Sep 01 2003 mmj@suse.de
 - Fix head/tail syntax [#29622]
-* Mon Aug 25 2003 - meissner@suse.de
+* Mon Aug 25 2003 meissner@suse.de
 - Fix winewrap default path to /usr/lib/wine #29069
-* Sat Aug 16 2003 - adrian@suse.de
+* Sat Aug 16 2003 adrian@suse.de
 - install desktop file from kappfinder
-* Tue Aug 12 2003 - meissner@suse.de
+* Tue Aug 12 2003 meissner@suse.de
 - Upgraded to latest release 20030813:
         - Partial implementation of the Microsoft Installer (msi.dll).
         - GUI for regedit (from ReactOS).
@@ -807,24 +818,24 @@ rm -rf $RPM_BUILD_ROOT
 - removed one confusing message.
 - skip broken truetype font, silence error messages with missing font dirs.
 - added winemenubuilder, rundll32 to list of programs.
-* Thu Jul 10 2003 - meissner@suse.de
+* Thu Jul 10 2003 meissner@suse.de
 - New upstream release 20030709:
         - Still more Direct3D and DirectSound improvements.
         - Inter-process clipboard support.
         - Locale handling improvements.
         - More progress on the kernel/ntdll separation.
         - Lots of bug fixes.
-* Mon Jun 23 2003 - meissner@suse.de
+* Mon Jun 23 2003 meissner@suse.de
 - New upstream release:
         - Still more Direct3D and DirectSound improvements.
         - Tons of fixes merged from Crossover Office 2.0.
         - New iphlpapi dll.
         - Lots of bug fixes.
-* Thu Jun 12 2003 - meissner@suse.de
+* Thu Jun 12 2003 meissner@suse.de
 - package documentation main directory too.
-* Fri May 23 2003 - meissner@suse.de
+* Fri May 23 2003 meissner@suse.de
 - remove CVS dirs.
-* Wed May 14 2003 - meissner@suse.de
+* Wed May 14 2003 meissner@suse.de
 - Upgraded to the last release snapshot:
 	- Some more reorganizations of the source tree.
         - A few more steps towards kernel/ntdll separation.
@@ -832,7 +843,7 @@ rm -rf $RPM_BUILD_ROOT
         - More compatible COM interfaces definitions.
         - Lots of bug fixes.
 - package wine.m4 into wine-devel.
-* Thu Apr 10 2003 - meissner@suse.de
+* Thu Apr 10 2003 meissner@suse.de
 - Upgraded to the last release snapshot:
         - Some reorganizations of the source tree.
 	- File change notifications.
@@ -846,31 +857,31 @@ rm -rf $RPM_BUILD_ROOT
         - More Direct3D work.
         - Lots of bug fixes.
 - Dropped my glibc 2.3 patches, they are now included.
-* Tue Apr 01 2003 - ro@suse.de
+* Tue Apr 01 2003 ro@suse.de
 - use mesa-devel-packages in neededforbuild
-* Fri Mar 07 2003 - meissner@suse.de
+* Fri Mar 07 2003 meissner@suse.de
 - CUPS_SONAME/SONAME_CUPS was swapped, we were not finding CUPS
   on systems without cups-devel and so unable to print.
-* Mon Mar 03 2003 - meissner@suse.de
+* Mon Mar 03 2003 meissner@suse.de
 - Do not output that debugging info on every keypress
 - dropped no longer needed SetParent optimization hack.
-* Mon Feb 17 2003 - meissner@suse.de
+* Mon Feb 17 2003 meissner@suse.de
 - Upgraded to current CVS.
 - InstallShield v6 should be fixed again.
-* Mon Feb 10 2003 - meissner@suse.de
+* Mon Feb 10 2003 meissner@suse.de
 - New configuration method. We no longer call winesetup,
   but use a quick and dirty shell script for fake windows
   setup.
 - Split sources into vanilla CVS tarball and SuSE patch.
-* Mon Jan 27 2003 - meissner@suse.de
+* Mon Jan 27 2003 meissner@suse.de
 - Make WINE work on STABLE again by no longer overloading
   __errno_location, but overwriting it instead. (This will
   break again as soon as TLS support is enabled for glibc.)
 - Upgraded to current CVS.
-* Thu Jan 23 2003 - meissner@suse.de
+* Thu Jan 23 2003 meissner@suse.de
 - Upgraded to current CVS, which includes fixes for gcc 3.3 build
   and winewrapper.
-* Fri Jan 17 2003 - meissner@suse.de
+* Fri Jan 17 2003 meissner@suse.de
 - Upgraded to current CVS:
         - Much better header files compatibility in Winelib.
         - A ton of Direct3D work.
@@ -879,7 +890,7 @@ rm -rf $RPM_BUILD_ROOT
 	- Lots of bug fixes.
 - Added libungif, jack, jack-devel, mesaglu, mesaglu-devel to neededforbuild.
 - Added iwidgets to requires.
-* Wed Jan 08 2003 - meissner@suse.de
+* Wed Jan 08 2003 meissner@suse.de
 - Upgraded to current CVS:
         - DLL linking now done through import libraries.
         - A couple of new tools to make Winelib easier to use.
@@ -890,23 +901,23 @@ rm -rf $RPM_BUILD_ROOT
         - Client-side fonts supported even without RENDER extension.
         - Regression tests no longer require Perl.
 	- Lots and lots of bugfixes and other new features.
-* Wed Nov 20 2002 - meissner@suse.de
+* Wed Nov 20 2002 meissner@suse.de
 - Upgraded to current CVS.
 - Some type punning warnings fixed.
 - Merged WineHQ default config file into winesetup configfiles.
-* Wed Nov 13 2002 - meissner@suse.de
+* Wed Nov 13 2002 meissner@suse.de
 - Updated to new upstream version.
-* Tue Nov 12 2002 - ro@suse.de
+* Tue Nov 12 2002 ro@suse.de
 - updated neededforbuild: jade_dsl,sp -> openjade,opensp
 -         xshared,xdevel -> x-devel-packages
-* Thu Oct 10 2002 - meissner@suse.de
+* Thu Oct 10 2002 meissner@suse.de
 - Updated to new upstream version:
         - Massive listview rewrite.
         - New MS RLE codec.
         - winemaker should be working again.
         - Beginnings of Direct3D 8 support.
 	- Lots of bugfixes.
-* Wed Sep 18 2002 - meissner@suse.de
+* Wed Sep 18 2002 meissner@suse.de
 - Reduced afmfiles by the one already included in the wineps driver itself.
 - include a stdole32.tlb so InstallShield v6 might work.
 - Fixed wine_set_default_reg script.
@@ -920,20 +931,20 @@ rm -rf $RPM_BUILD_ROOT
         - More OLE and shell improvements.
         - NAS and AudioIO sound drivers.
         - Still more Sparc portability fixes.
-* Mon Sep 09 2002 - meissner@suse.de
+* Mon Sep 09 2002 meissner@suse.de
 - If there is an existing windows install, still prefer the fake install
   since it is way less dangerous #19222.
 - Use managed mode by default (so windows are just normal KDE windows)
-* Mon Sep 02 2002 - meissner@suse.de
+* Mon Sep 02 2002 meissner@suse.de
 - Do not suggest installing KDE menus of winesetup (they are not
   there and wine does its own now). #18648.
-* Sun Sep 01 2002 - ro@suse.de
+* Sun Sep 01 2002 ro@suse.de
 - Use ExclusiveArch instead of BuildArch
-* Thu Aug 29 2002 - meissner@suse.de
+* Thu Aug 29 2002 meissner@suse.de
 - Change location of menu entries from /Wine/ to /SuSE/Wine/ to
   make the registered apps appear in the menu.
 - Try to support biarch build for compiling on x86_64.
-* Mon Aug 12 2002 - meissner@suse.de
+* Mon Aug 12 2002 meissner@suse.de
 - Upgraded to current CVS snapshot (20020812)
 - Upstream summary:
         - Beginnings of an IDL compiler.
@@ -946,29 +957,29 @@ rm -rf $RPM_BUILD_ROOT
         - Lots of bug fixes.
 - Local:
 	- Started enhancing PPC port.
-* Sun Jul 28 2002 - kukuk@suse.de
+* Sun Jul 28 2002 kukuk@suse.de
 - remove libz from neededforbuild
-* Wed Jul 10 2002 - meissner@suse.de
+* Wed Jul 10 2002 meissner@suse.de
 - Upgraded to current CVS snapshot (20020710),
   lots of bugfixes inside.
 - Tried fixing a Lotus Notes problem with the attachment information
   window.
-* Mon Jun 17 2002 - meissner@suse.de
+* Mon Jun 17 2002 meissner@suse.de
 - Upgraded to current CVS snapshot (20020614),
   lots of new features, bugfixes et.al.
 - Tweaked wine_init so it does not recursively call itself.
-* Tue Apr 09 2002 - meissner@suse.de
+* Tue Apr 09 2002 meissner@suse.de
 - Upgraded to current CVS snapshot (20020409),
   contains a lot of fixes from upstream (including parts of the CrossOver
   Office patches)
 - neededforbuild jpeg -> libjpeg, added kdelibs stuff to support
   arts client, added sane for twain32.dll
-* Tue Feb 05 2002 - pmladek@suse.cz
+* Tue Feb 05 2002 pmladek@suse.cz
 - added warning message into winesetup [#12932]
 - added the same message also into README.SuSE
-* Fri Feb 01 2002 - ro@suse.de
+* Fri Feb 01 2002 ro@suse.de
 - changed neededforbuild <libpng> to <libpng-devel-packages>
-* Mon Jan 28 2002 - pmladek@suse.cz
+* Mon Jan 28 2002 pmladek@suse.cz
 - removed old wine.systemreg, wine.userreg, there are newer in winesetuptk
 - removed old generic*.ppd and used the newer one from the wine sources
 - fixed ppd configuration in default config files [#12934]
@@ -978,7 +989,7 @@ rm -rf $RPM_BUILD_ROOT
 - tested print from wine
 - updated README.SuSE
 - cleanded up spec file
-* Tue Jan 22 2002 - pmladek@suse.cz
+* Tue Jan 22 2002 pmladek@suse.cz
 - updated wine to the latest snapshot 20011226
 - updated winesetuptk to version 0.5.1b:
   * improved detection of windows partitions
@@ -989,9 +1000,9 @@ rm -rf $RPM_BUILD_ROOT
   * preserve drive order like it's known under Windows
 - WineSetupTk did not linked against static Tcl/Tk/Itcl libraries,
   instead of it was used old Makefile and old launcher
-* Mon Dec 03 2001 - ro@suse.de
+* Mon Dec 03 2001 ro@suse.de
 - fixed neededforbuild <docbktls> to <docbook-toys>
-* Thu Nov 01 2001 - bjacke@suse.de
+* Thu Nov 01 2001 bjacke@suse.de
 - make sub package -devel
 - add "cups-devel cups-libs libpng jpeg openssl libtiff" to
   neededforbuild for CUPS support
@@ -999,15 +1010,15 @@ rm -rf $RPM_BUILD_ROOT
 - remove xf86 from Requires (X libs are autorequired)
 - remove Wine provides
 - fixed to not provide man and doc directories
-* Mon Sep 24 2001 - pmladek@suse.cz
+* Mon Sep 24 2001 pmladek@suse.cz
 - fixed documentation - added docbook_4 again
-* Tue Sep 18 2001 - pmladek@suse.cz
+* Tue Sep 18 2001 pmladek@suse.cz
 - fixed warning messages on start up
-* Mon Aug 27 2001 - pmladek@suse.cz
+* Mon Aug 27 2001 pmladek@suse.cz
 - fixed to compile:
   * removed docbook_4 from #neededforbuild
 - fixed path to documentation by installation
-* Fri Aug 24 2001 - pmladek@suse.cz
+* Fri Aug 24 2001 pmladek@suse.cz
 - updated to version 20010731
 - added detection of version of wine config
 - fixed autorun of winesetup when config does not exist or
@@ -1017,26 +1028,26 @@ rm -rf $RPM_BUILD_ROOT
 - new script for registry updating
 - fixed licence tag
 - fixed README.SuSE
-* Tue Aug 21 2001 - ro@suse.de
+* Tue Aug 21 2001 ro@suse.de
 - neededforbuild: replaced sp_libs with sp
-* Mon May 07 2001 - pmladek@suse.cz
+* Mon May 07 2001 pmladek@suse.cz
 - fixed error message from find command when winesetup starts
-* Sun Apr 29 2001 - pmladek@suse.cz
+* Sun Apr 29 2001 pmladek@suse.cz
 - fixed README.SuSE
-* Thu Apr 26 2001 - pmladek@suse.cz
+* Thu Apr 26 2001 pmladek@suse.cz
 - added itcl to requires (it isn't in default selections but
   it's needed by winesetup)
-* Tue Apr 10 2001 - pmladek@suse.cz
+* Tue Apr 10 2001 pmladek@suse.cz
 - updated to version 20010326
 - fixed winesetup through changes in wine config
 	- paths to afm files in config now
 	- another declaration of default load order
 - fixed README.SuSE
-* Thu Mar 29 2001 - ro@suse.de
+* Thu Mar 29 2001 ro@suse.de
 - fixed neededforbuild
-* Tue Mar 27 2001 - pmladek@suse.cz
+* Tue Mar 27 2001 pmladek@suse.cz
 - returned flag --sysconfdir=/etc to configure (my bug)
-* Tue Mar 27 2001 - pmladek@suse.cz
+* Tue Mar 27 2001 pmladek@suse.cz
 - added URL
 - repaired licence tag
 - wine up-dated to the version 20010305
@@ -1051,48 +1062,48 @@ rm -rf $RPM_BUILD_ROOT
 - generated html documentation from sgml documentation
 - removed sgml documentation from binary rpm
 - cleaned up spec file
-* Thu Mar 08 2001 - uli@suse.de
+* Thu Mar 08 2001 uli@suse.de
 - renamed mesadev -> mesa-devel in neededforbuild
-* Wed Feb 07 2001 - uli@suse.de
+* Wed Feb 07 2001 uli@suse.de
 - fixed for glibc 2.2.1
-* Fri Dec 08 2000 - uli@suse.de
+* Fri Dec 08 2000 uli@suse.de
 - update -> 20001202
 - added regapi
 - added wine.systemreg and wine.userreg
 - added afm and ppd files for printing
 - added afm and ppd sections to wine.conf
-* Thu Nov 23 2000 - arvin@suse.de
+* Thu Nov 23 2000 arvin@suse.de
 - changed spec file to use a buildroot
 - fixed group tag
-* Tue Sep 26 2000 - ro@suse.de
+* Tue Sep 26 2000 ro@suse.de
 - removed bogus requires
 - added mesa-stuff to neededforbuild
-* Mon Sep 25 2000 - hhetter@suse.de
+* Mon Sep 25 2000 hhetter@suse.de
 - updated to 20000821
-* Thu Jul 27 2000 - arvin@suse.de
+* Thu Jul 27 2000 arvin@suse.de
 - changed wine.conf to noreplace
-* Mon May 15 2000 - bk@suse.de
+* Mon May 15 2000 bk@suse.de
 - updated to version 20000430
-* Tue Apr 18 2000 - bk@suse.de
+* Tue Apr 18 2000 bk@suse.de
 - updated to version 20000326
 - added all new files to filelist
 - use RPM_OPT_FLAGS as CFLAGS
-* Fri Jan 28 2000 - bg@suse.de
+* Fri Jan 28 2000 bg@suse.de
 - new version 20000109
 - moved /usr/man to /usr/share/man
-* Sun Oct 17 1999 - ro@suse.de
+* Sun Oct 17 1999 ro@suse.de
 - fixed neededforbuild
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Tue Jul 20 1999 - mkraft@suse.de
+* Tue Jul 20 1999 mkraft@suse.de
 - new version 990704
-* Thu Apr 01 1999 - uli@suse.de
+* Thu Apr 01 1999 uli@suse.de
 - new version 990328
-* Mon Mar 29 1999 - rolf@suse.de
+* Mon Mar 29 1999 rolf@suse.de
 - new version 990314
-* Tue Dec 01 1998 - rolf@suse.de
+* Tue Dec 01 1998 rolf@suse.de
 - new version 981108
-* Fri Jun 26 1998 - rolf@suse.de
+* Fri Jun 26 1998 rolf@suse.de
 - new version 980614
-* Thu Jan 15 1998 - rolf@suse.de
+* Thu Jan 15 1998 rolf@suse.de
 - new version 980104
diff --git a/winetricks b/winetricks
index 60f9345..83fe2f9 100644
--- a/winetricks
+++ b/winetricks
@@ -2,7 +2,7 @@
 # Quick and dirty script to download and install various 
 # redistributable runtime libraries
 #
-# Copyright 2007 Google (Dan Kegel, dank@kegel.com)
+# Copyright 2007, 2008 Google (Dan Kegel, dank@kegel.com)
 # Thanks to Detlef Riekenberg for lots of updates
 # Thanks to Saulius Krasuckas for corrections and suggestions
 
@@ -52,27 +52,36 @@ usage() {
     echo " gecko      Install the HTML rendering Engine (Mozilla)"
     echo " jet40      Install Jet 4.0 Service Pack 8"
     echo " liberation Install Red Hat's Liberation fonts (Sans, Serif, Mono)"
-    echo " mdac27     MDAC 2.7: Microsoft ODBC drivers, etc."
+    echo " mdac25     MDAC 2.5: Microsoft ODBC drivers, etc."
+    echo " mdac27     MDAC 2.7."
     echo " mdac28     MDAC 2.8."
     echo " mfc40"
     echo " mono11     mono 1.1.13-gtksharp-2.8.2 (deprecated, use 1.2)"
-    echo " mono12     mono mono-1.2.5.2-gtksharp-2.10.2"
+    echo " mono12     mono mono-1.2.6-gtksharp-2.10.2"
     echo " msi2       Microsoft Installer 2.0"
     echo " msxml3     (Note: install a bit squidgy; see http://bugs.winehq.org/show_bug.cgi?id=7849)"
     echo " msxml4     (Note: installing this requires fake c: to be named harddrive1!)"
     echo " pdh        Install pdh.dll (Performance Data Helper)"
+    echo " riched20   Use Microsoft's riched20 and riched32"
     echo " tahoma     Install MS Tahoma font (not part of corefonts)"
     echo " vbvm50     Visual Basic 5 runtime"
     echo " vbrun60    Visual Basic 6 runtime"
+    echo " xvid       Install xvid video codecs"
+    echo " ffdshow    Install ffdshow video codecs"
     echo " vcrun6     vc6redist from VS6sp4, including mfc42"
     echo " vcrun2005  Visual C++ 2005 redistributable libraries"
+    echo " vcrun2005sp1 Visual C++ 2005sp1 redistributable libraries"
+    echo " vcrun2008  Visual C++ 2008 redistributable libraries"
     echo " wsh51      Windows Scripting Host 5.1"
     echo " wsh56      Windows Scripting Host 5.6 (install vcrun6 first)"
     echo " wsh56js    Windows scripting 5.6, jscript only, no cscript"
     echo " wsh56vb    Windows scripting 5.6, vbscript only, no cscript"
     echo "Pseudopackages:"
+    echo " allfonts     Install above fonts (corefonts, tahoma, liberation)"
+    echo " allvcodecs   Install Open Source video codecs (xvid, ffdshow)"
     echo " fakeie6      Set registry to claim IE6sp1 is installed"
     echo " native_mdac  Override odbc32 and odbccp32"
+    echo " winver=nt40  Set windows version to nt40"
     echo " winver=win98 Set windows version to win98"
     echo " winver=winxp Set windows version to winxp"
     echo " winver=      Set windows version to default (win2k)"
@@ -116,13 +125,22 @@ try() {
 }
 
 # Download a file
+# Usage: package url [sha1sum [filename]]
+# Caches downloads in winetrickscache/$package
 download() {
-    file=`basename "$1"`
-    test -f $WINETRICKS_CACHE/$file || (cd $WINETRICKS_CACHE; wget -c "$1")
-    if [ "$2"x != ""x ]
+    if [ "$4"x != ""x ]
     then
-	echo "$2  $WINETRICKS_CACHE/$file" > $WINETRICKS_CACHE/$file.sha1sum
-	try sha1sum --status -c $WINETRICKS_CACHE/$file.sha1sum
+        file="$4"
+    else
+        file=`basename "$2"`
+    fi
+    cache=$WINETRICKS_CACHE/$1
+    mkdir -p $cache
+    test -f $cache/$file || (cd $cache; wget -c "$2")
+    if [ "$3"x != ""x ]
+    then
+	echo "$3  $cache/$file" > $cache/$file.sha1sum
+	try sha1sum --status -c $cache/$file.sha1sum
     fi
 }
 
@@ -170,7 +188,7 @@ _EOF_
 #----- One function per package, in alphabetical order ----------
 
 load_art2kmin() {
-    download http://download.microsoft.com/download/office2000dev/art2kmin/1/win98/en-us/art2kmin.exe 73be2622254d1f857a204a03f068787542b985e9
+    download . http://download.microsoft.com/download/office2000dev/art2kmin/1/win98/en-us/art2kmin.exe 73be2622254d1f857a204a03f068787542b985e9
     try $WINE $WINETRICKS_CACHE/art2kmin.exe
     cd "$WINEPREFIX/drive_c/ART2KMin Setup"
     try $WINE Setup.exe INSTALLPFILES=1 /wait $WINETRICKS_QUIET
@@ -181,7 +199,7 @@ load_art2kmin() {
 
 load_cc580() {
     # http://www.microsoft.com/downloads/details.aspx?familyid=6f94d31a-d1e0-4658-a566-93af0d8d4a1e
-    download http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde
+    download . http://download.microsoft.com/download/platformsdk/redist/5.80.2614.3600/w9xnt4/en-us/cc32inst.exe 94c3c494258cc54bd65d2f0153815737644bffde
 
     try $WINE $WINETRICKS_CACHE/cc32inst.exe "/T:`$WINE winepath -w $WINETRICKS_TMP`" /c $WINETRICKS_QUIET
     try $WINE $WINETRICKS_TMP/comctl32.exe
@@ -198,8 +216,8 @@ load_corefonts() {
     # TODO: let user pick mirror, check md5; 
     # see http://corefonts.sourceforge.net/msttcorefonts-2.0-1.spec for how
     # TODO: add more fonts
-    download http://internap.dl.sourceforge.net/sourceforge/corefonts/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e
-    download http://internap.dl.sourceforge.net/sourceforge/corefonts/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060
+    download . http://downloads.sourceforge.net/corefonts/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e
+    download . http://downloads.sourceforge.net/corefonts/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060
     try $WINE $WINETRICKS_CACHE/arial32.exe $WINETRICKS_QUIET
     try $WINE $WINETRICKS_CACHE/times32.exe $WINETRICKS_QUIET
 }
@@ -209,7 +227,7 @@ load_corefonts() {
 load_dcom98() {
     # Install native dcom per http://wiki.winehq.org/NativeDcom
     # to avoid http://bugs.winehq.org/show_bug.cgi?id=4228
-    download http://download.microsoft.com/download/d/1/3/d13cd456-f0cf-4fb2-a17f-20afc79f8a51/DCOM98.EXE aff002bd03f17340b2bef2e6b9ea8e3798e9ccc1
+    download . http://download.microsoft.com/download/d/1/3/d13cd456-f0cf-4fb2-a17f-20afc79f8a51/DCOM98.EXE aff002bd03f17340b2bef2e6b9ea8e3798e9ccc1
 
     # Pick win98 so we can install native dcom
     set_winver win98
@@ -272,6 +290,14 @@ _EOF_
 
 #----------------------------------------------------------------
 
+load_ffdshow() {
+    # ffdshow
+    download . http://downloads.sourceforge.net/ffdshow-tryout/ffdshow_beta4a_rev1723_20071224_clsid.exe 6e018139c3ed4800aa3580267d1da47fa936a82a
+    try $WINE $WINETRICKS_CACHE/ffdshow_beta4a_rev1723_20071224_clsid.exe $WINETRICKS_SILENT
+}
+
+#----------------------------------------------------------------
+
 load_gecko() {
     # Load the HTML rendering Engine (Gecko)
     # FIXME: shouldn't this code be in some script installed 
@@ -283,7 +309,7 @@ load_gecko() {
 
     if ! test -f $WINETRICKS_CACHE/wine_gecko-$GECKO_VERSION.cab
     then
-       download "http://source.winehq.org/winegecko.php?v=$GECKO_VERSION"
+       download . "http://source.winehq.org/winegecko.php?v=$GECKO_VERSION"
     fi
 
     cat > $WINETRICKS_TMP/geckopath.reg <<_EOF_
@@ -316,7 +342,7 @@ load_gdiplus() {
     # http://msdn.microsoft.com/library/en-us/gdicpp/GDIPlus/GDIPlus.asp
     # however, there's no standalone installer.  So install a random
     # app that happens to bundle it.
-    download http://download.microsoft.com/download/a/1/a/a1adc39b-9827-4c7a-890b-91396aed2b86/ppviewer.exe 4d13ca85d1d366167b6247ac7340b7736b1bff87
+    download . http://download.microsoft.com/download/a/1/a/a1adc39b-9827-4c7a-890b-91396aed2b86/ppviewer.exe 4d13ca85d1d366167b6247ac7340b7736b1bff87
     try $WINE $WINETRICKS_CACHE/ppviewer.exe $WINETRICKS_QUIET
     # And then make it globally available.
     try cp "$programfilesdir_unix/Microsoft Office/PowerPoint Viewer/GDIPLUS.DLL" $WINEPREFIX/drive_c/windows/system32/
@@ -327,7 +353,7 @@ load_gdiplus() {
 load_jet40() {
     # http://support.microsoft.com/kb/239114
     # See also http://bugs.winehq.org/show_bug.cgi?id=6085
-    download http://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe 8cd25342030857969ede2d8fcc34f3f7bcc2d6d4
+    download . http://download.microsoft.com/download/4/3/9/4393c9ac-e69e-458d-9f6d-2fe191c51469/jet40sp8_9xnt.exe 8cd25342030857969ede2d8fcc34f3f7bcc2d6d4
     try $WINE $WINETRICKS_CACHE/jet40sp8_9xnt.exe $WINETRICKS_QUIET
 }
 
@@ -335,7 +361,7 @@ load_jet40() {
 
 load_liberation() {
     # http://www.redhat.com/promo/fonts/
-    download http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 503fd3c60174b53f59ca41927b72e4a44bab586b
+    download . http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz 503fd3c60174b53f59ca41927b72e4a44bab586b
     tar --wildcards -C $WINEPREFIX/drive_c/windows/fonts -xvzf $WINETRICKS_CACHE/liberation-fonts-ttf-3.tar.gz '*.ttf'
 }
 
@@ -347,41 +373,43 @@ set_native_mdac() {
     override_dlls odbc32 odbccp32
 }
 
-load_mdac27() {
-    # FIXME to support other versions of mdac, will need to change
-    # 'download' to save in a subdirectory named after the package,
-    # since every version of mdac uses the same installer filename
-    download http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
+#----------------------------------------------------------------
+
+load_mdac25() {
+    download mdac25 http://download.microsoft.com/download/e/e/4/ee4fe9ee-6fa1-4ab6-ab8c-fe1769f4edcf/mdac_typ.exe 09e974a5dbebaaa08c7985a4a1126886dc05fd87
     set_native_mdac
-    try $WINE $WINETRICKS_CACHE/mdac_typ.exe
+    set_winver nt40
+    try $WINE $WINETRICKS_CACHE/mdac25/mdac_typ.exe
+    unset_winver
+}
+
+#----------------------------------------------------------------
+
+load_mdac27() {
+    download mdac27 http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee
+    set_native_mdac
+    try $WINE $WINETRICKS_CACHE/mdac27/mdac_typ.exe
 }
 
 #----------------------------------------------------------------
 
 load_mdac28() {
-    # FIXME to support other versions of mdac, will need to change
-    # 'download' to save in a subdirectory named after the package,
-    # since every version of mdac uses the same installer filename
-    # Well, shoot.  Can we get away with case sensitivity here?
-    download http://download.microsoft.com/download/c/d/f/cdfd58f1-3973-4c51-8851-49ae3777586f/MDAC_TYP.EXE 91bd59f0b02b67f3845105b15a0f3502b9a2216a
+    download mdac28 http://download.microsoft.com/download/c/d/f/cdfd58f1-3973-4c51-8851-49ae3777586f/MDAC_TYP.EXE 91bd59f0b02b67f3845105b15a0f3502b9a2216a
     set_native_mdac
     set_winver win98
-    try $WINE $WINETRICKS_CACHE/MDAC_TYP.EXE
+    try $WINE $WINETRICKS_CACHE/mdac28/MDAC_TYP.EXE
     unset_winver
 }
 
 #----------------------------------------------------------------
 
 load_mfc40() {
-    # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=cf3005d4-7009-4d2d-89d1-b32c482c8a2d
-    echo "Note: Microsoft has since pulled this download.  Sorry!"
-    
-    download http://download.microsoft.com/download/sql65/Patch/6.5/WIN98/EN-US/MFC40i.exe af289f72aceda7ac2b43bf94b574e74a48cb5663
-    cd $WINETRICKS_TMP/
+    # See http://support.microsoft.com/kb/122244
+    download . http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe c6cac71f32405ccb09c6f375e0738e6e13f073e4
+    try unzip -d $WINETRICKS_TMP $WINETRICKS_CACHE/ole2v.exe
+    try cp -f $WINETRICKS_TMP/MFC40.DLL $WINEPREFIX/drive_c/windows/system32/
+
     rm -rf $WINETRICKS_TMP/*
-    try cabextract $WINETRICKS_CACHE/MFC40i.exe
-    try cp mfc40.dll $WINEPREFIX/drive_c/windows/system32/
-    cd "$olddir"
 }
 
 #----------------------------------------------------------------
@@ -389,7 +417,7 @@ load_mfc40() {
 load_mono11() {
     echo "Mono-1.1 is deprecated.  The Mono team prefers you use Mono-1.2 instead."
     # Load Mono, have it handle all .net requests
-    download ftp://www.go-mono.com/archive/1.1.13.8.2/windows-installer/0/mono-1.1.13.8.2-gtksharp-2.8.2-win32-0.exe e8725d03f51fcca2849d1a8f1d87ceb6f77c1d82
+    download . ftp://www.go-mono.com/archive/1.1.13.8.2/windows-installer/0/mono-1.1.13.8.2-gtksharp-2.8.2-win32-0.exe e8725d03f51fcca2849d1a8f1d87ceb6f77c1d82
     # Anyone know how to get it to do a silent install?
     try $WINE $WINETRICKS_CACHE/mono-1.1.13.8.2-gtksharp-2.8.2-win32-0.exe
 
@@ -412,9 +440,9 @@ _EOF_
 
 load_mono12() {
     # Load Mono, have it handle all .net requests
-    download ftp://www.go-mono.com/archive/1.2.5.2/windows-installer/0/mono-1.2.5.2-gtksharp-2.10.2-win32-0.exe 58fc6b9e7bedc9110c2e8f0864c39c8335f34533
+    download . ftp://www.go-mono.com/archive/1.2.6/windows-installer/5/mono-1.2.6-gtksharp-2.10.2-win32-5.exe 71248e9dd4c96b63878a54ef21f71cdc9a77083d
     # Anyone know how to get it to do a silent install?
-    try $WINE $WINETRICKS_CACHE/mono-1.2.5.2-gtksharp-2.10.2-win32-0.exe
+    try $WINE $WINETRICKS_CACHE/mono-1.2.6-gtksharp-2.10.2-win32-5.exe
 
     cat > $WINETRICKS_TMP/mono_1.2.reg <<_EOF_
 REGEDIT4
@@ -434,7 +462,7 @@ _EOF_
 
 load_msi2() {
     # Install native msi per http://wiki.winehq.org/NativeMsi
-    download http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
+    download . http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
 
     # Pick win98 so we can install native msi
     set_winver win98
@@ -457,7 +485,7 @@ load_msxml3() {
     # Service Pack 5
     #download http://download.microsoft.com/download/a/5/e/a5e03798-2454-4d4b-89a3-4a47579891d8/msxml3.msi
     # Service Pack 7
-    download http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
+    download . http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi d4c2178dfb807e1a0267fce0fd06b8d51106d913
     # http://bugs.winehq.org/show_bug.cgi?id=7849 fixed since 0.9.37
     override_dlls msxml3
     try $WINE msiexec /i $WINETRICKS_CACHE/msxml3.msi $WINETRICKS_QUIET
@@ -469,7 +497,7 @@ load_msxml4() {
     # http://www.microsoft.com/downloads/details.aspx?familyid=24B7D141-6CDF-4FC4-A91B-6F18FE6921D4
     if ! test -f $WINETRICKS_CACHE/msxml4.msi
     then
-       download http://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
+       download . http://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
        rm -rf $WINETRICKS_TMP/*
 
        try $WINE $WINETRICKS_CACHE/msxml4-KB927978-enu.exe "/x:`$WINE winepath -w $WINETRICKS_TMP`" $WINETRICKS_QUIET
@@ -490,7 +518,7 @@ load_pdh() {
     # http://support.microsoft.com/kb/284996
     if ! test -f $WINETRICKS_CACHE/pdhinst.exe
     then
-       download http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e
+       download . http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e
     fi
     try $WINE $WINETRICKS_CACHE/pdhinst.exe
     try cp -f $WINEPREFIX/drive_c/windows/temp/x86/Pdh.Dll $WINEPREFIX/drive_c/windows/system32/pdh.dll
@@ -521,9 +549,21 @@ volnum() {
 
 #----------------------------------------------------------------
 
+load_riched20() {
+    # http://support.microsoft.com/?kbid=249973
+    download . http://download.microsoft.com/download/winntsp/Patch/RTF/NT4/EN-US/Q249973i.EXE f0b7663f15dbd31410435483ba832318c7a70470
+    try cabextract --directory=$WINETRICKS_TMP $WINETRICKS_CACHE/Q249973i.EXE
+    try cp -f $WINETRICKS_TMP/riched??.dll $WINEPREFIX/drive_c/windows/system32
+    override_dlls riched20 riched32
+    
+    rm -rf $WINETRICKS_TMP/*
+}
+
+#----------------------------------------------------------------
+
 load_tahoma() {
     # The tahoma font is needed by e.g. Steam
-    download http://internap.dl.sourceforge.net/sourceforge/corefonts/wd97vwr32.exe 8edf758f92513094a94e50b7826cd6f2b7696b8c
+    download . http://downloads.sourceforge.net/corefonts/wd97vwr32.exe 8edf758f92513094a94e50b7826cd6f2b7696b8c
     try cabextract --directory=$WINETRICKS_TMP $WINETRICKS_CACHE/wd97vwr32.exe
     try cabextract --directory=$WINETRICKS_TMP $WINETRICKS_TMP/Viewer1.cab
     try cp -f $WINETRICKS_TMP/tahoma.ttf $WINEPREFIX/drive_c/windows/fonts/tahoma.ttf
@@ -533,14 +573,14 @@ load_tahoma() {
 #----------------------------------------------------------------
 
 load_vbvm50() {
-    download http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe 28bfaf09b8ac32cf5ffa81252f3e2fadcb3a8f27
+    download . http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe 28bfaf09b8ac32cf5ffa81252f3e2fadcb3a8f27
     try $WINE $WINETRICKS_CACHE/msvbvm50.exe $WINETRICKS_QUIET
 }
 
 #----------------------------------------------------------------
 
 load_vbrun60() {
-    download http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbrun60.exe 2dc00e5fc701492bcba7ac58f057ee43751e18e5
+    download . http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbrun60.exe 2dc00e5fc701492bcba7ac58f057ee43751e18e5
     # Exits with status 43 for some reason?
     $WINE $WINETRICKS_CACHE/vbrun60.exe $WINETRICKS_QUIET || true
 }
@@ -552,7 +592,7 @@ load_vcrun6() {
 
     if ! test -f $WINETRICKS_CACHE/vcredist.exe
     then
-       download http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe 382c8f5a7f41189af8d4165cf441f274b7e2a457
+       download . http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe 382c8f5a7f41189af8d4165cf441f274b7e2a457
        rm -rf $WINETRICKS_TMP/*
        
        try $WINE $WINETRICKS_CACHE/vc6redistsetup_enu.exe "/T:`$WINE winepath -w $WINETRICKS_TMP`" /c $WINETRICKS_QUIET
@@ -584,8 +624,29 @@ load_vcrun6() {
 load_vcrun2005() {
     # Load the Visual C++ 2005 runtime libraries
     # See http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
-    download http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe 47fba37de95fa0e2328cf2e5c8ebb954c4b7b93c
-    try $WINE $WINETRICKS_CACHE/vcredist_x86.exe $WINETRICKS_QUIET
+    download vcrun2005 http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe 47fba37de95fa0e2328cf2e5c8ebb954c4b7b93c
+    try $WINE $WINETRICKS_CACHE/vcrun2005/vcredist_x86.exe $WINETRICKS_QUIET
+}
+
+#----------------------------------------------------------------
+
+load_vcrun2005sp1() {
+    # Load the Visual C++ 2005 SP1 runtime libraries
+    # See http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647
+    download vcrun2005sp1 http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe 7dfa98be78249921dd0eedb9a3dd809e7d215c8d 
+    try $WINE $WINETRICKS_CACHE/vcrun2005sp1/vcredist_x86.exe $WINETRICKS_QUIET
+}
+
+#----------------------------------------------------------------
+
+load_vcrun2008() {
+    # Otherwise it complains...
+    volnum
+
+    # Load the Visual C++ 2008 runtime libraries
+    # See http://www.microsoft.com/downloads/details.aspx?familyid=9b2da534-3e03-4391-8a4d-074b9f2bc1bf
+    download vcrun2008 http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5381140/vcredist_x86.exe 56719288ab6514c07ac2088119d8a87056eeb94a 
+    try $WINE $WINETRICKS_CACHE/vcrun2008/vcredist_x86.exe $WINETRICKS_QUIET
 }
 
 #----------------------------------------------------------------
@@ -593,7 +654,7 @@ load_vcrun2005() {
 load_wsh51() {
     # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=bfdb7709-51e4-4aa6-adb0-05444e68dd80&DisplayLang=en
     echo "Note: Microsoft has since pulled this download.  Sorry!"
-    download http://download.microsoft.com/download/8/7/5/8751c696-282d-49da-b118-2735315dbb5e/ste51en.exe ecc0fb713684294fe6c759f4633c5befbeba1ade
+    download . http://download.microsoft.com/download/8/7/5/8751c696-282d-49da-b118-2735315dbb5e/ste51en.exe ecc0fb713684294fe6c759f4633c5befbeba1ade
 
     try $WINE $WINETRICKS_CACHE/ste51en.exe $WINETRICKS_QUIET
 
@@ -606,7 +667,7 @@ load_wsh51() {
 load_wsh56() {
     # See also http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=C717D943-7E4B-4622-86EB-95A22B832CAA
     echo "Note: Microsoft has since pulled this download.  Sorry!"
-    download http://download.microsoft.com/download/2/8/a/28a5a346-1be1-4049-b554-3bc5f3174353/WindowsXP-Windows2000-Script56-KB917344-x86-enu.exe f4692766caa3ee9b38d4166845486c6199a33457
+    download . http://download.microsoft.com/download/2/8/a/28a5a346-1be1-4049-b554-3bc5f3174353/WindowsXP-Windows2000-Script56-KB917344-x86-enu.exe f4692766caa3ee9b38d4166845486c6199a33457
 
     try $WINE $WINETRICKS_CACHE/WindowsXP-Windows2000-Script56-KB917344-x86-enu.exe $WINETRICKS_QUIET
 }
@@ -616,7 +677,7 @@ load_wsh56() {
 load_wsh56js() {
     # This installs jscript 5.6 (but not vbscript)
     # See also http://www.microsoft.com/downloads/details.aspx?FamilyID=16dd21a1-c4ee-4eca-8b80-7bd1dfefb4f8&DisplayLang=en
-    download http://download.microsoft.com/download/b/c/3/bc3a0c36-fada-497d-a3de-8b0139766f3b/Windows2000-KB917344-56-x86-enu.exe add5f74c5bd4da6cfae47f8306de213ec6ed52c8
+    download . http://download.microsoft.com/download/b/c/3/bc3a0c36-fada-497d-a3de-8b0139766f3b/Windows2000-KB917344-56-x86-enu.exe add5f74c5bd4da6cfae47f8306de213ec6ed52c8
 
     try $WINE $WINETRICKS_CACHE/Windows2000-KB917344-56-x86-enu.exe $WINETRICKS_QUIET
 }
@@ -626,19 +687,29 @@ load_wsh56js() {
 load_wsh56vb() {
     # This installs vbscript 5.6 (but not jscript)
     # See also http://www.microsoft.com/downloads/details.aspx?familyid=4F728263-83A3-464B-BCC0-54E63714BC75
-    download http://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 48f14a93db33caff271da0c93f334971f9d7cb22
+    download . http://download.microsoft.com/download/IE60/Patch/Q318089/W9XNT4Me/EN-US/vbs56men.exe 48f14a93db33caff271da0c93f334971f9d7cb22
 
     try $WINE $WINETRICKS_CACHE/vbs56men.exe $WINETRICKS_QUIET
 }
 
 #----------------------------------------------------------------
 
+load_xvid() {
+    # xvid
+    download . "http://www.digital-digest.com/software/getdownload.php?sid=1052&did=1" c4440346a09261af3eda3aa3fe2a17e46c817515 XviD-1.1.3-28062007.exe
+    try $WINE $WINETRICKS_CACHE/XviD-1.1.3-28062007.exe $WINETRICKS_SILENT
+}
+
+#----------------------------------------------------------------
+
 
 while test "$1" != ""
 do
+    PACKAGE=$1
     case $1 in
     -q) WINETRICKS_QUIET="/q"
         WINETRICKS_UNIXQUIET="-q"
+        WINETRICKS_SILENT="/silent"
         WINEDEBUG=${WINEDEBUG:-"fixme-all"}
         export WINEDEBUG
         ;;
@@ -647,10 +718,12 @@ do
     cc580) load_cc580;;
     corefonts) load_corefonts;;
     dcom98) load_dcom98;;
+    ffdshow) load_ffdshow;;
     gdiplus) load_gdiplus;;
     gecko) load_gecko;;
     jet40) load_jet40;;
     liberation) load_liberation;;
+    mdac25) load_mdac25;;
     mdac27) load_mdac27;;
     mdac28) load_mdac28;;
     mfc40) load_mfc40;;
@@ -660,17 +733,25 @@ do
     msxml3) load_msxml3;;
     msxml4) load_msxml4;;
     pdh) load_pdh;;
+    riched20) load_riched20;;
     tahoma) load_tahoma;;
     vbvm50) load_vbvm50;;
     vbrun60) load_vbrun60;;
+    vcodecs) load_vcodecs;;
     vcrun6) load_vcrun6;;
     vcrun2005) load_vcrun2005;;
+    vcrun2005sp1) load_vcrun2005sp1;;
+    vcrun2008) load_vcrun2008;;
     wsh51) load_wsh51;;
     wsh56) load_wsh56;;
     wsh56js) load_wsh56js;;
     wsh56vb) load_wsh56vb;;
+    xvid) load_xvid;;
 
     fakeie6) set_fakeie6;;
+    allfonts) load_corefonts; load_tahoma; load_liberation;;
+    allvcodecs) load_vcrun6; load_ffdshow; load_xvid;;
+    winver=nt40) set_winver nt40;;
     winver=win98) set_winver win98;;
     winver=winxp) set_winver winxp;;
     winver=) unset_winver;;