From e54a3c33a8201065fdd27885c01d13dc08567bc425e12e3140042fede3ea7824 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 24 Aug 2008 09:08:21 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=45

---
 wine-1.1.1.tar.bz2 |  3 ---
 wine-1.1.3.tar.bz2 |  3 +++
 wine.changes       | 20 ++++++++++++++++++++
 wine.spec          | 23 ++++++++++++++++++++---
 winetricks         | 10 ++++++----
 5 files changed, 49 insertions(+), 10 deletions(-)
 delete mode 100644 wine-1.1.1.tar.bz2
 create mode 100644 wine-1.1.3.tar.bz2

diff --git a/wine-1.1.1.tar.bz2 b/wine-1.1.1.tar.bz2
deleted file mode 100644
index 7adaa3f..0000000
--- a/wine-1.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ce2123218a3d8656f1a5b557879ace81280881b57b60978d1583a5a53d95405
-size 14079762
diff --git a/wine-1.1.3.tar.bz2 b/wine-1.1.3.tar.bz2
new file mode 100644
index 0000000..7dadb0e
--- /dev/null
+++ b/wine-1.1.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e331b614067a77e5b94dc2c97391ec4ccc438ee07acf7a0bf44b6c18c24fd31b
+size 14290689
diff --git a/wine.changes b/wine.changes
index 9625aee..a52566b 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat Aug 23 01:59:45 CEST 2008 - meissner@suse.de
+
+- Updated to upstream 1.1.3
+  - Beginnings of ddraw overlay support.
+  - Many more crypt32 functions.
+  - Improved support for tables in Richedit.
+  - Support for NETWM window maximization.
+  - Many installer fixes.
+  - Tweaks for better PulseAudio support.
+  - Various bug fixes.
+- Updated to upstream 1.1.2
+  - Control panel improvements and new appwiz panel.
+  - Restructurations of state handling in Direct3D.
+  - Support for timer queue functions.
+  - Many MSXML improvements.
+  - Several fixes to Solaris support.
+  - Various bug fixes.
+- Updated winetricks to current version
+
 -------------------------------------------------------------------
 Fri Aug 15 14:33:18 CEST 2008 - ro@suse.de
 
diff --git a/wine.spec b/wine.spec
index 3fe9aea..963bb04 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package wine (Version 1.1.1)
+# spec file for package wine (Version 1.1.3)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,8 +23,8 @@ BuildRequires:  alsa-devel bison capi4linux-devel cups-devel desktop-file-utils
 License:        LGPL v2.1 or later
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        1.1.1
-Release:        17
+Version:        1.1.3
+Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
 Source0:        wine-%version.tar.bz2
@@ -126,6 +126,23 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/aclocal/wine.m4
 
 %changelog
+* Sat Aug 23 2008 meissner@suse.de
+- Updated to upstream 1.1.3
+  - Beginnings of ddraw overlay support.
+  - Many more crypt32 functions.
+  - Improved support for tables in Richedit.
+  - Support for NETWM window maximization.
+  - Many installer fixes.
+  - Tweaks for better PulseAudio support.
+  - Various bug fixes.
+- Updated to upstream 1.1.2
+  - Control panel improvements and new appwiz panel.
+  - Restructurations of state handling in Direct3D.
+  - Support for timer queue functions.
+  - Many MSXML improvements.
+  - Several fixes to Solaris support.
+  - Various bug fixes.
+- Updated winetricks to current version
 * Fri Aug 15 2008 ro@suse.de
 - add exclusivearch to specfile
 * Sat Jul 12 2008 meissner@suse.de
diff --git a/winetricks b/winetricks
index 6ff210a..5bba262 100644
--- a/winetricks
+++ b/winetricks
@@ -30,7 +30,7 @@ esac
 
 case "$1" in
 -V|--version) 
-  echo "Winetricks version 20080710.  (C) Dan Kegel.  LGPL."
+  echo "Winetricks version 20080720.  (C) Dan Kegel.  LGPL."
   exit 0
   ;;
 esac
@@ -246,7 +246,9 @@ rm -rf "$WINETRICKS_TMP"/*
 
 # The folder-name is localized!
 programfilesdir_win="`$WINE cmd.exe /c echo "%ProgramFiles%"`"
+test x"$programfilesdir_win" != x || die "$WINE cmd.exe /c echo '%ProgramFiles%' returned empty string"
 programfilesdir_unix="`$WINE winepath -u "$programfilesdir_win"`"
+test x"$programfilesdir_unix" != x || die "winepath -u $programfilesdir_win returned empty string"
 
 # Did the user rename Fonts to fonts?
 if ! test -d "$WINEPREFIX"/drive_c/windows/Fonts && test -d "$WINEPREFIX"/drive_c/windows/fonts 
@@ -332,7 +334,7 @@ download() {
            # fortunately, we know it
            try curl -L -o $file -C - --header "Accept-Encoding: gzip,deflate" "$2"
         fi
-        cd $olddir
+        cd "$olddir"
     fi
     if [ "$3"x != ""x ]
     then
@@ -759,8 +761,8 @@ load_firefox3() {
 
 load_ffdshow() {
     # ffdshow
-    download . $SOURCEFORGE/ffdshow-tryout/ffdshow_beta4a_rev1723_20071224_clsid.exe 6e018139c3ed4800aa3580267d1da47fa936a82a
-    try $WINE "$WINETRICKS_CACHE"/ffdshow_beta4a_rev1723_20071224_clsid.exe $WINETRICKS_SILENT
+    download . $SOURCEFORGE/ffdshow-tryout/ffdshow_beta5_rev2033_20080705_clsid.exe 6da6837e2f400923ff5294a6591a88a3eee5ee40
+    try $WINE "$WINETRICKS_CACHE"/ffdshow_beta5_rev2033_20080705_clsid.exe $WINETRICKS_SILENT
 }
 
 #----------------------------------------------------------------