- updated to 1.1.23

Changed files:
    wine-disable-valgrind.patch -> 1.3
    wine-notarget.patch -> 1.2
    wine.spec -> 1.360

diff --git a/wine-disable-valgrind.patch b/wine-disable-valgrind.patch
index 684c51583e4026233ec7074e725ec322e5e5f1d1..d291a2619753b7e0327fd60d0e0b76da9e2e56b7 100644 (file)
--- a/wine-disable-valgrind.patch
+++ b/wine-disable-valgrind.patch
@@ -1,14 +1,12 @@
 diff -ruN wine-0.9.51./configure.ac wine-0.9.51/configure.ac
 --- wine-0.9.51./configure.ac  2007-12-16 20:15:52.000000000 +0100
 +++ wine-0.9.51/configure.ac   2007-12-16 20:31:42.099007759 +0100
-@@ -265,9 +265,7 @@
-       syscall.h \
+@@ -377,8 +377,6 @@
        termios.h \
        unistd.h \
--      utime.h \
+       utime.h \
 -      valgrind/memcheck.h \
--      valgrind/valgrind.h
-+      utime.h
+-      valgrind/valgrind.h \
+       zlib.h
  )
  AC_HEADER_STAT()
- 

diff --git a/wine-notarget.patch b/wine-notarget.patch
index 2a64eaa5fb7993a161040b95e0d5ab6239151163..2fdf4762dfe2844609020714831d3818eb765839 100644 (file)
--- a/wine-notarget.patch
+++ b/wine-notarget.patch
@@ -1,15 +1,16 @@
 --- wine-1.1.15/tools/winegcc/winegcc.c~       2009-02-13 18:01:33.000000000 +0100
 +++ wine-1.1.15/tools/winegcc/winegcc.c        2009-02-25 14:37:44.743493303 +0100
 @@ -302,8 +302,7 @@
-         else str = CXX;
+         else str = CPP;
          break;
+     case proc_cc:
      case proc_as:
--        if (opts->target) str = strmake( "%s-as", opts->target );
--        else str = AS;
-+        str = AS;
+-        if (opts->target) str = strmake( "%s-gcc", opts->target );
+-        else str = CC;
++        str = CC;
          break;
-     default:
-         assert(0);
+     case proc_cxx:
+         if (opts->target) str = strmake( "%s-g++", opts->target );
 --- wine-1.1.15/tools/winebuild/utils.c~       2009-02-13 18:01:33.000000000 +0100
 +++ wine-1.1.15/tools/winebuild/utils.c        2009-02-25 14:52:51.450410422 +0100
 @@ -250,13 +250,6 @@

diff --git a/wine.spec b/wine.spec
index 09d6b7ea842022af6277534471891446f787a6df..135fa24d36c9e1ad0516aa7abdc05af82fe13975 100644 (file)
--- a/wine.spec
+++ b/wine.spec
@@ -29,13 +29,13 @@ Summary(es.UTF-8):  Ejecuta programas Windows en Linux
 Summary(pl.UTF-8):     Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):  Executa programas Windows no Linux
 Name:          wine
-Version:       1.1.22
+Version:       1.1.23
 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         Applications/Emulators
 Source0:       http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
-# Source0-md5: d1714d7b483316d656a47b61af3e48d9
+# Source0-md5: 2a588487d4553a01db8326c7db710da2
 Source1:       %{name}-uninstaller.desktop
 Patch0:                %{name}-fontcache.patch
 Patch1:                %{name}-makedep.patch