rpms/wine/devel wine-alsa-pulseaudio.patch, NONE, 1.1 wine-desktop-mime.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 sources, 1.61, 1.62 wine.spec, 1.86, 1.87
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Tue Jun 17 19:13:22 UTC 2008
- Previous message (by thread): rpms/wine/F-7 wine-alsa-pulseaudio.patch, NONE, 1.1 wine-desktop-mime.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 sources, 1.61, 1.62 wine.spec, 1.82, 1.83
- Next message (by thread): rpms/firefox/F-9 mozilla-firstrun.patch, NONE, 1.1 .cvsignore, 1.80, 1.81 firefox.spec, 1.299, 1.300 sources, 1.92, 1.93
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7175/devel
Modified Files:
.cvsignore sources wine.spec
Added Files:
wine-alsa-pulseaudio.patch wine-desktop-mime.patch
Log Message:
- version upgrade
- several bugfixes
wine-alsa-pulseaudio.patch:
--- NEW FILE wine-alsa-pulseaudio.patch ---
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index f4452e5..34ab57a 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -570,7 +570,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
snd_pcm_access_t access;
snd_pcm_format_t format = -1;
unsigned int rate;
- unsigned int buffer_time = 500000;
+ unsigned int buffer_time = 120000;
unsigned int period_time = 10000;
snd_pcm_uframes_t buffer_size;
snd_pcm_uframes_t period_size;
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 31078cb..ad08fae 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -91,7 +91,7 @@ HRESULT mmErr(UINT err)
/* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
int ds_emuldriver = 0;
int ds_hel_buflen = 32768;
-int ds_snd_queue_max = 10;
+int ds_snd_queue_max = 12;
int ds_snd_queue_min = 6;
int ds_snd_shadow_maxsize = 2;
int ds_hw_accel = DS_HW_ACCEL_FULL;
wine-desktop-mime.patch:
--- NEW FILE wine-desktop-mime.patch ---
--- tools/wine.desktop.orig 2008-06-17 11:21:52.000000000 +0200
+++ tools/wine.desktop 2008-06-17 11:23:16.000000000 +0200
@@ -8,5 +8,5 @@
Name[ru]=Wine ÐмÑлÑÑÐ¾Ñ Windows
Name[fr]=Ãmulateur Windows Wine
Exec=wine start /unix %f
-MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;
+MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;
NoDisplay=true
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore 7 Jun 2008 09:20:04 -0000 1.60
+++ .cvsignore 17 Jun 2008 19:12:27 -0000 1.61
@@ -1 +1 @@
-wine-1.0-rc4-fe.tar.bz2
+wine-1.0-fe.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources 7 Jun 2008 09:20:04 -0000 1.61
+++ sources 17 Jun 2008 19:12:27 -0000 1.62
@@ -1 +1 @@
-5d25a801d1b3dfcb0b76337dc14db95c wine-1.0-rc4-fe.tar.bz2
+8131688557a6168bf9248e48ee9e90ad wine-1.0-fe.tar.bz2
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- wine.spec 7 Jun 2008 09:20:04 -0000 1.86
+++ wine.spec 17 Jun 2008 19:12:27 -0000 1.87
@@ -1,6 +1,6 @@
Name: wine
Version: 1.0
-Release: 0.4.rc4%{?dist}
+Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
Group: Applications/Emulators
@@ -18,7 +18,7 @@
# Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
# programs/winecfg/libraries.c: "winemp3.acm",
-Source0: %{name}-%{version}-rc4-fe.tar.bz2
+Source0: %{name}-%{version}-fe.tar.bz2
Source1: wine.init
Source3: wine-README-Fedora
Source4: wine-32.conf
@@ -45,10 +45,13 @@
# explain how to use wine with pulseaudio
Source402: README-FEDORA-PULSEAUDIO
+Patch402: wine-alsa-pulseaudio.patch
Patch0: wine-prefixfonts.patch
Patch1: wine-rpath.patch
+# fix #448338
+Patch2: wine-desktop-mime.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i386
@@ -98,6 +101,7 @@
Requires: wine-core = %{version}-%{release}
Requires: wine-capi = %{version}-%{release}
Requires: wine-cms = %{version}-%{release}
+Requires: wine-desktop = %{version}-%{release}
Requires: wine-esd = %{version}-%{release}
Requires: wine-jack = %{version}-%{release}
Requires: wine-ldap = %{version}-%{release}
@@ -121,17 +125,27 @@
Summary: Wine core package
Group: Applications/Emulators
Requires: %{_bindir}/xmessage
-Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
-Requires(post): desktop-file-utils >= 0.8
-Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-Requires(postun): desktop-file-utils >= 0.8
Obsoletes: wine <= 0.9.15-1%{?dist}
Obsoletes: wine-arts < 0.9.34
%description core
Wine core package includes the basic wine stuff needed by all other packages.
+%package desktop
+Summary: Desktop integration features for wine
+Group: Application/Emulators
+Requires(post): /sbin/chkconfig, /sbin/service,
+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}
+
+%description desktop
+Desktop integration features for wine, including mime-types and a binary format
+handler service.
+
%package tools
Summary: Additional wine tools
Group: Applications/Emulators
@@ -207,10 +221,12 @@
with the Wine Windows(TM) emulation libraries.
%prep
-%setup -q -n %{name}-%{version}-rc4-fe
+%setup -q -n %{name}-%{version}-fe
%patch0
%patch1
+%patch2
%patch400
+%patch402 -p1
%build
# work around gcc bug see #440139
@@ -322,8 +338,10 @@
%clean
rm -rf %{buildroot}
-%post core
-/sbin/ldconfig
+%post core -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
+
+%post desktop
update-desktop-database &>/dev/null || :
if [ $1 = 1 ]; then
/sbin/chkconfig --add wine
@@ -331,14 +349,13 @@
/sbin/service wine start &>/dev/null || :
fi
-%preun core
+%preun desktop
if [ $1 = 0 ]; then
/sbin/service wine stop >/dev/null 2>&1
/sbin/chkconfig --del wine
fi
-%postun core
-/sbin/ldconfig
+%postun desktop
update-desktop-database &>/dev/null || :
%post esd -p /sbin/ldconfig
@@ -386,7 +403,6 @@
%{_bindir}/wineshelllink-fedora
%{_bindir}/winecfg
%{_bindir}/uninstaller
-%{_initrddir}/wine
%{_libdir}/wine/expand.exe.so
%{_libdir}/wine/winhelp.exe16
%{_libdir}/wine/winhlp32.exe.so
@@ -411,14 +427,6 @@
%{_libdir}/wine/winedevice.exe.so
%{_libdir}/wine/uninstaller.exe.so
%dir %{_datadir}/wine
-%{_datadir}/applications/fedora-wine-mime-msi.desktop
-%{_datadir}/applications/fedora-wine.desktop
-%{_datadir}/applications/fedora-wine-regedit.desktop
-%{_datadir}/applications/fedora-wine-uninstaller.desktop
-%{_datadir}/applications/fedora-wine-winecfg.desktop
-%{_datadir}/applications/fedora-wine-wineboot.desktop
-%{_datadir}/desktop-directories/Wine.directory
-%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
%{_mandir}/man1/wine.1.gz
%{_mandir}/man1/wineserver.1*
%lang(fr) %{_mandir}/fr.UTF-8/man1/*
@@ -737,8 +745,6 @@
%{_bindir}/winemaker
%{_bindir}/winemine
%{_bindir}/winepath
-#%{_bindir}/winhelp
-#%{_libdir}/wine/winhelp.exe.so
%{_libdir}/wine/explorer.exe.so
%{_libdir}/wine/control.exe.so
%{_libdir}/wine/cmd.exe.so
@@ -752,10 +758,21 @@
%{_libdir}/wine/winver.exe.so
%{_libdir}/wine/wordpad.exe.so
%{_libdir}/wine/write.exe.so
+
+%files desktop
%{_datadir}/applications/fedora-wine-notepad.desktop
%{_datadir}/applications/fedora-wine-winefile.desktop
%{_datadir}/applications/fedora-wine-winemine.desktop
%{_datadir}/applications/fedora-wine-winhelp.desktop
+%{_datadir}/applications/fedora-wine-mime-msi.desktop
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_datadir}/applications/fedora-wine-wineboot.desktop
+%{_datadir}/desktop-directories/Wine.directory
+%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
+%{_initrddir}/wine
%files esd
%defattr(-,root,root,-)
@@ -817,6 +834,17 @@
%{_libdir}/wine/*.def
%changelog
+* Tue Jun 17 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0-1
+- version upgrade (#446311,#417161)
+- fix wine.desktop mime types (#448338)
+- add desktop package including desktop files and binary handler (#441310)
+- pull in some wine alsa/pulseaudio patches (#344281)
+
+* Mon Jun 16 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0-0.5.rc5
+- version upgrade
+
* Fri Jun 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.0-0.4.rc4
- version upgrade
- Previous message (by thread): rpms/wine/F-7 wine-alsa-pulseaudio.patch, NONE, 1.1 wine-desktop-mime.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 sources, 1.61, 1.62 wine.spec, 1.82, 1.83
- Next message (by thread): rpms/firefox/F-9 mozilla-firstrun.patch, NONE, 1.1 .cvsignore, 1.80, 1.81 firefox.spec, 1.299, 1.300 sources, 1.92, 1.93
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list