OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=43

wine-1.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:734c7f9d2b2ad2eed25b899e7d2235d7c82ac49d31aee23c585eebba50e2130d
-size 13950187

wine-1.1.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ce2123218a3d8656f1a5b557879ace81280881b57b60978d1583a5a53d95405
+size 14079762

wine.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Fri Jul 11 22:10:34 CEST 2008 - meissner@suse.de
+
+- Updated to upstream 1.1.1 - development release
+  - Fixes for Photoshop CS3 and Office 2007 installers.
+  - More progress on gdiplus.
+  - Support for Unicode files in regedit.
+  - Improved video playback.
+  - Many Richedit fixes and improvements.
+  - Various bug fixes.
+
+- winetricks updated
+  - ogg and schroeder/dirac codecs
+  - Added firefox3, kde
+  - Simpler recipe for msls31
+  - sets win2k while installing vcrun2005.
+  - Fixed DirectX9 install
+  - Added visual j# 2.0 runtime
+  - divx codec download location changed
+  - Add comctl32.ocx
+  - Added autohotkey
+
+- Upgraded to upstream 1.1.0 - development release
+  - Many more gdiplus functions implemented.
+  - Improved graphics tablet support.
+  - Many Richedit fixes and improvements.
+  - Support for HWND_MESSAGE windows.
+  - A lot of new MSHTML functions.
+  - Many fixes in MSI registry handling.
+  - Initial implementation of the inetmib1 DLL.
+  - Improvements to the quartz renderers.
+  - Various bug fixes.
+
 -------------------------------------------------------------------
 Tue Jun 17 16:45:46 CEST 2008 - meissner@suse.de
 

wine.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package wine (Version 1.0)
+# spec file for package wine (Version 1.1.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,11 +12,11 @@
 
 
 Name:           wine
-BuildRequires:  alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel hal-devel jack-devel libgphoto2-devel libjpeg-devel liblcms-devel libpng-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files
+BuildRequires:  alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel hal-devel libgphoto2-devel libjpeg-devel liblcms-devel libpng-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files
 License:        LGPL v2.1 or later
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        1.0
+Version:        1.1.1
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -118,6 +118,34 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/aclocal/wine.m4
 
 %changelog
+* Sat Jul 12 2008 meissner@suse.de
+- Updated to upstream 1.1.1 - development release
+  - Fixes for Photoshop CS3 and Office 2007 installers.
+  - More progress on gdiplus.
+  - Support for Unicode files in regedit.
+  - Improved video playback.
+  - Many Richedit fixes and improvements.
+  - Various bug fixes.
+- winetricks updated
+  - ogg and schroeder/dirac codecs
+  - Added firefox3, kde
+  - Simpler recipe for msls31
+  - sets win2k while installing vcrun2005.
+  - Fixed DirectX9 install
+  - Added visual j# 2.0 runtime
+  - divx codec download location changed
+  - Add comctl32.ocx
+  - Added autohotkey
+- Upgraded to upstream 1.1.0 - development release
+  - Many more gdiplus functions implemented.
+  - Improved graphics tablet support.
+  - Many Richedit fixes and improvements.
+  - Support for HWND_MESSAGE windows.
+  - A lot of new MSHTML functions.
+  - Many fixes in MSI registry handling.
+  - Initial implementation of the inetmib1 DLL.
+  - Improvements to the quartz renderers.
+  - Various bug fixes.
 * Tue Jun 17 2008 meissner@suse.de
 - Upgraded to upstream 1.0 - first stable release
 - updated winetricks

winetricks

@@ -9,7 +9,6 @@
 # Default values for important settings if not already in environment.
 # These settings should not need editing here.
 WINE=${WINE:-wine}
-WINEPREFIXCREATE=${WINEPREFIXCREATE:-wineprefixcreate}
 WINEPREFIX=${WINEPREFIX:-$HOME/.wine}
 
 # Internal variables; these locations are not too important
@@ -31,7 +30,7 @@ esac
 
 case "$1" in
 -V|--version) 
-  echo "Winetricks version 20080622.  (C) Dan Kegel.  LGPL."
+  echo "Winetricks version 20080710.  (C) Dan Kegel.  LGPL."
   exit 0
   ;;
 esac
@@ -53,12 +52,6 @@ then
   die "Cannot find wine ($WINE)"
 fi
 
-which "$WINEPREFIXCREATE" > /dev/null
-if test "$?" -ne "0"
-then
-  die "Cannot find wineprefixcreate ($WINEPREFIXCREATE)"
-fi
-
 #----------------------------------------------------------------
 
 usage() {
@@ -104,6 +97,7 @@ usage() {
     echo " msxml3        MS XML version 3"
     echo " msxml4        MS XML version 4"
     echo " msxml6        MS XML version 6" 
+    echo " ogg           ogg filters/codecs: flac, theora, speex, vorbis, schroedinger"
     echo " pdh           MS pdh.dll (Performance Data Helper)"
     echo " quicktime72   Apple Quicktime 7.2"
     echo " riched20      MS riched20 and riched32"
@@ -128,6 +122,8 @@ usage() {
     echo " xvid          xvid video codec"
     echo "Apps:"
     echo " autohotkey    Autohotkey (open source gui scripting language)"
+    echo " firefox3      Firefox Version 3"
+    echo " kde           KDE for Windows installer"
     echo " mpc           Media Player Classic"
     echo " vlc           VLC media player"
     echo "Pseudopackages:"
@@ -242,15 +238,15 @@ case x"$1" in
 x) GUI=1; dogui ; set $todo ;;
 x-h|x--help|xhelp) usage ; exit 1 ;;
 esac
-test -d "$WINEPREFIX" || $WINEPREFIXCREATE > /dev/null 2>&1
+test -d "$WINEPREFIX" || $WINE cmd /c echo yes > /dev/null 2>&1
 mkdir -p "$WINETRICKS_CACHE"
 olddir=`pwd`
 # Clean up after failed runs, if needed
 rm -rf "$WINETRICKS_TMP"/*
 
 # The folder-name is localized!
-programfilesdir_win=`$WINE cmd.exe /c echo "%ProgramFiles%"`
+programfilesdir_win="`$WINE cmd.exe /c echo "%ProgramFiles%"`"
-programfilesdir_unix=`$WINE winepath -u "$programfilesdir_win"`
+programfilesdir_unix="`$WINE winepath -u "$programfilesdir_win"`"
 
 # Did the user rename Fonts to fonts?
 if ! test -d "$WINEPREFIX"/drive_c/windows/Fonts && test -d "$WINEPREFIX"/drive_c/windows/fonts 
@@ -625,8 +621,10 @@ load_divx() {
     # 6.8.2: 02203fdc4dddd13e789c39b22902837da31d2a1d ?
     # 6.8.2: e36bf87c1675d0cf9169839bc0cd8f866b9db026 as of 4 jun 2008 as http://download.divx.com/divx/DivXInstaller.exe
     # 6.8.3: f4f4387ef89316aea440a29f3e24c1f1945e14af as of 20 jun 2008 as http://download.divx.com/divx/abt/b1/DivXInstaller.exe
-    download . http://download.divx.com/divx/abt/b1/DivXInstaller.exe f4f4387ef89316aea440a29f3e24c1f1945e14af
+    # 6.8.4: c5fcb1465a1bb24d1c104c2588fdb6706d1e1476 as of 10 Jul 2008 as http://download.divx.com/divx/abt/b1/DivXInstaller.exe
-    try $WINE "$WINETRICKS_CACHE"/DivXInstaller $WINETRICKS_SILENT
+    download divx-6.8.4 http://download.divx.com/divx/abt/b1/DivXInstaller.exe c5fcb1465a1bb24d1c104c2588fdb6706d1e1476
+
+    try $WINE "$WINETRICKS_CACHE"/divx-6.8.4/DivXInstaller $WINETRICKS_SILENT
 }
 
 #----------------------------------------------------------------
@@ -746,6 +744,19 @@ _EOF_
 
 #----------------------------------------------------------------
 
+load_firefox3() {
+    # Firefox 3
+    download . "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0/win32/en-US/Firefox Setup 3.0.exe" 91cf99edbc4eb1ef6af3179e6126abc659309265
+    if [ "$WINETRICKS_QUIET"x = ""x ]
+    then
+       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.exe" 
+    else
+       try $WINE "$WINETRICKS_CACHE"/"Firefox Setup 3.0.exe" -ms
+    fi
+}
+
+#----------------------------------------------------------------
+
 load_ffdshow() {
     # ffdshow
     download . $SOURCEFORGE/ffdshow-tryout/ffdshow_beta4a_rev1723_20071224_clsid.exe 6e018139c3ed4800aa3580267d1da47fa936a82a
@@ -872,6 +883,17 @@ load_jet40() {
 
 #----------------------------------------------------------------
 
+load_kde() {
+    download . http://winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.2-1.exe 504a05f3e47c429747a71bcc930c551ff4758d83
+    mkdir -p "$programfilesdir_unix/kde"
+    cp "$WINETRICKS_CACHE"/kdewin-installer-gui-0.9.2-1.exe "$programfilesdir_unix/kde"
+    cd "$programfilesdir_unix/kde"
+    try $WINE "$programfilesdir_win\\kde\\kdewin-installer-gui-0.9.2-1.exe"
+    cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
 load_liberation() {
     # http://www.redhat.com/promo/fonts/ 				
     download . http://www.redhat.com/f/fonts/liberation-fonts.tar.gz 38276ab5e4322e131217d26f193bfce396195c0a
@@ -987,15 +1009,9 @@ load_msi2() {
 
 load_msls31() {
     # Install native Microsoft Line Services (needed by e-Sword, possibly only when using native riched20)
-    # http://www.microsoft.com/reader/downloads/pc.mspx
+    download . http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US/InstMsiA.exe e739c40d747e7c27aacdb07b50925b1635ee7366
-    if ! test -f "$programfilesdir_unix/Microsoft Reader"/msls31.dll
+    try cabextract --directory="$WINETRICKS_TMP" "$WINETRICKS_CACHE"/InstMsiA.exe
-    then
+    try cp -f "$WINETRICKS_TMP"/msls31.dll "$WINEPREFIX"/drive_c/windows/system32
-        echo "Installing Microsoft Reader (which includes a copy of msls31.dll)"
-        download . http://download.microsoft.com/download/d/0/9/d099ad62-41d1-4e92-9935-67955a437460/MSReaderSetupUSA.exe 055af1f589e2ae9896f17dbf33d8a3f156d10282
-        try $WINE "$WINETRICKS_CACHE"/MSReaderSetupUSA.exe 
-    fi
-
-    cp "$programfilesdir_unix/Microsoft Reader"/msls31.dll "$WINEPREFIX"/drive_c/windows/system32
 }
 
 #----------------------------------------------------------------
@@ -1041,6 +1057,23 @@ load_msxml6() {
 
 #----------------------------------------------------------------
 
+load_ogg() {
+    # flac, ogg, speex, vorbis, ogm source, ogg source
+    download . http://cross-lfs.org/~mlankhorst/oggcodecs_0.81.2.exe c9d10a8f1b65b9f3824e227333d66247e14fad4c
+    #try $WINE "$WINETRICKS_CACHE"/oggcodecs_0.81.2.exe $WINETRICKS_QUIET
+    # oh, and the new schroedinger direct show filter, too
+    # see following URLs for more info
+    # http://www.diracvideo.org/
+    # http://cross-lfs.org/~mlankhorst/direct-schro.txt
+    # http://www.diracvideo.org/git?p=direct-schro.git;a=summary
+    # Requires wine-1.1.1
+    download . http://cross-lfs.org/~mlankhorst/direct-schro.dll
+    cp "$WINETRICKS_CACHE"/direct-schro.dll "$WINEPREFIX"/drive_c/windows/system32/direct-schro.dll
+    try $WINE regsvr32 direct-schro.dll
+}
+
+#----------------------------------------------------------------
+
 load_pdh() {
     # http://support.microsoft.com/kb/284996
     download . http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.2668/NT4/EN-US/pdhinst.exe f42448660def8cd7f42b34aa7bc7264745f4425e
@@ -1232,8 +1265,10 @@ load_vcrun2003() {
 load_vcrun2005() {
     # Load the Visual C++ 2005 runtime libraries
     # See http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
+    set_winver win2k
     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
+    unset_winver
 }
 
 #----------------------------------------------------------------
@@ -1393,6 +1428,7 @@ do
     divx) load_divx;;
     dotnet11) load_dotnet11; load_fontfix;;
     dotnet20) load_dotnet20; load_fontfix;;
+    firefox|firefox3) load_firefox3;;
     ffdshow) load_ffdshow;;
     flash) load_flash;;
     fontfix) load_fontfix;;
@@ -1400,6 +1436,7 @@ do
     gecko) load_gecko;;
     icodecs) load_icodecs;;
     jet40) load_jet40;;
+    kde) load_kde;;
     liberation) load_liberation;;
     mdac25) load_mdac25;;
     mdac27) load_mdac27;;
@@ -1412,6 +1449,7 @@ do
     msxml3) load_msxml3;;
     msxml4) load_msxml4;;
     msxml6) load_msxml6;;
+    ogg) load_ogg;;
     pdh) load_pdh;;
     quicktime72) load_gdiplus; load_quicktime72;;  # needs e.g. gdiplus.dll.GdipCloneImage
     riched20) load_riched20;;