rpms/wine/devel .cvsignore, 1.82, 1.83 sources, 1.83, 1.84 wine-x86_64-prefix.patch, 1.1, 1.2 wine.spec, 1.116, 1.117
Andreas Bierfert
awjb at fedoraproject.org
Wed Jan 20 05:39:55 UTC 2010
Author: awjb
Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16208/devel
Modified Files:
.cvsignore sources wine-x86_64-prefix.patch wine.spec
Log Message:
- version upgrade
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- .cvsignore 19 Dec 2009 14:39:53 -0000 1.82
+++ .cvsignore 20 Jan 2010 05:39:55 -0000 1.83
@@ -1 +1 @@
-wine-1.1.35-fe.tar.bz2
+wine-1.1.36-fe.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- sources 19 Dec 2009 14:39:53 -0000 1.83
+++ sources 20 Jan 2010 05:39:55 -0000 1.84
@@ -1 +1 @@
-1ade8d4ccd3130692c2c68871683fa9b wine-1.1.35-fe.tar.bz2
+826ca1bc9cfe2b63eee268baeaf36816 wine-1.1.36-fe.tar.bz2
wine-x86_64-prefix.patch:
dlls/ntdll/server.c | 2 +-
libs/wine/config.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Index: wine-x86_64-prefix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine-x86_64-prefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wine-x86_64-prefix.patch 19 Dec 2009 14:39:53 -0000 1.1
+++ wine-x86_64-prefix.patch 20 Jan 2010 05:39:55 -0000 1.2
@@ -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)
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- wine.spec 19 Dec 2009 14:39:53 -0000 1.116
+++ wine.spec 20 Jan 2010 05:39:55 -0000 1.117
@@ -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.
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
More information about the scm-commits
mailing list