From 61b5474b5c72d74276c9e13b373a97133c8c6a4a Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <awjb@fedoraproject.org>
Date: Jan 20 2010 05:39:55 +0000
Subject: - version upgrade


---

diff --git a/.cvsignore b/.cvsignore
index 8763626..89e7c16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wine-1.1.35-fe.tar.bz2
+wine-1.1.36-fe.tar.bz2
diff --git a/sources b/sources
index 76b6bb2..9b6d9db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ade8d4ccd3130692c2c68871683fa9b  wine-1.1.35-fe.tar.bz2
+826ca1bc9cfe2b63eee268baeaf36816  wine-1.1.36-fe.tar.bz2
diff --git a/wine-x86_64-prefix.patch b/wine-x86_64-prefix.patch
index 0d8bbfc..7f3e3ff 100644
--- a/wine-x86_64-prefix.patch
+++ b/wine-x86_64-prefix.patch
@@ -13,3 +13,14 @@
  
  static char *bindir;
  static char *dlldir;
+--- dlls/ntdll/server.c.orig	2010-01-18 23:06:56.000000000 +0100
++++ dlls/ntdll/server.c	2010-01-18 23:07:27.000000000 +0100
+@@ -698,7 +698,7 @@
+ {
+     static int started;  /* we only try once */
+     char *argv[3];
+-    static char wineserver[] = "server/wineserver";
++    static char wineserver[] = "server/wineserver64";
+     static char debug[] = "-d";
+ 
+     if (!started)
diff --git a/wine.spec b/wine.spec
index c921570..8c9272e 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,6 @@
 %define no64bit 0
 Name:		wine
-Version:	1.1.35
+Version:	1.1.36
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -184,6 +184,7 @@ Requires(post): desktop-file-utils >= 0.8
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): desktop-file-utils >= 0.8
 Requires:       wine-core = %{version}-%{release}
+Requires:       wine-common = %{version}-%{release}
 BuildArch:      noarch
 
 %description desktop
@@ -361,6 +362,7 @@ mv %{buildroot}%{_bindir}/wine{,32}
 # if x86_64 rename to wine64
 %ifarch x86_64
 mv %{buildroot}%{_bindir}/wine{,64}
+mv %{buildroot}%{_bindir}/wineserver{,64}
 %endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/wine
@@ -549,16 +551,14 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dxdiag.exe.so
 
 %ifarch %{ix86}
+%{_bindir}/wine32
 %{_bindir}/wine-preloader
-%endif
 %{_bindir}/wineserver
-
-%ifarch %{ix86}
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
-%{_bindir}/wine32
 %endif
 %ifarch x86_64
 %{_bindir}/wine64
+%{_bindir}/wineserver64
 %{_sysconfdir}/ld.so.conf.d/wine-64.conf
 %endif
 
@@ -700,6 +700,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/lodctr.exe.so
 %{_libdir}/wine/lz32.dll.so
 %{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mapistub.dll.so
 %{_libdir}/wine/mciavi32.dll.so
 %{_libdir}/wine/mcicda.dll.so
 %{_libdir}/wine/mciseq.dll.so
@@ -864,20 +865,18 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/xmllite.dll.so
 %ifnarch x86_64
 # 16 bit and other non 64bit stuff
-%{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/ifsmgr.vxd.so
 %{_libdir}/wine/mmdevldr.vxd.so
 %{_libdir}/wine/monodebg.vxd.so
 %{_libdir}/wine/vdhcp.vxd.so
-%{_libdir}/wine/user.exe16
+%{_libdir}/wine/user.exe16.so
 %{_libdir}/wine/vmm.vxd.so
 %{_libdir}/wine/vnbt.vxd.so
 %{_libdir}/wine/vnetbios.vxd.so
 %{_libdir}/wine/vtdapi.vxd.so
 %{_libdir}/wine/vwin32.vxd.so
 %{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/wprocs.dll16
 
 %{_libdir}/wine/avifile.dll16.so
 %{_libdir}/wine/comm.drv16.so
@@ -890,7 +889,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/display.drv16.so
 %{_libdir}/wine/gdi.exe16.so
 %{_libdir}/wine/imm.dll16.so
-%{_libdir}/wine/krnl386.exe16
+%{_libdir}/wine/krnl386.exe16.so
 %{_libdir}/wine/keyboard.drv16.so
 %{_libdir}/wine/lzexpand.dll16.so
 %{_libdir}/wine/mmsystem.dll16.so
@@ -929,6 +928,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winsock.dll16.so
 %{_libdir}/wine/wintab.dll16.so
 %{_libdir}/wine/wow32.dll.so
+#%{_libdir}/wine/wprocs.dll16.so
 %endif
 
 %files common
@@ -1061,6 +1061,11 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/openal32.dll.so
 
 %changelog
+* Mon Jan 18 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.36-1
+- version upgrade (#554102)
+- require -common in -desktop (#549190)
+
 * Sat Dec 19 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.35-1
 - version upgrade