diff --git a/.cvsignore b/.cvsignore index 5d0a90d..54245f2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-0.9.24-fe.tar.bz2 +wine-0.9.25-fe.tar.bz2 diff --git a/sources b/sources index e447940..b77ed79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e1e10bec1cac8f2021b7d7a3e3ef5bd wine-0.9.24-fe.tar.bz2 +4d26cc14b481f2ab7026c23d83086753 wine-0.9.25-fe.tar.bz2 diff --git a/wine-README-Fedora b/wine-README-Fedora index 05bf675..f0e5205 100644 --- a/wine-README-Fedora +++ b/wine-README-Fedora @@ -1,15 +1,22 @@ -Wine directory structure used in Fedora Core Linux: -=================================================== +Wine directory structure used in Fedora Linux: +============================================== -\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by -default. It is created with (empty) C:\windows and C:\windows\system +${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for it +by default. It is created with (empty) C:\windows and C:\windows\system directories, needed to operate Wine without an existing Windows -installation, if it doesn't already exists. +installation, if it does not already exist. If you want to use Wine with an existing Windows installation that is mounted, for example, in /mnt/windows-c, change the symlink -\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the +${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the defaults set by installation. -If you do this, you can safely remove \${HOME}/.wine/drive_c. -(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.) +If you do this, you can safely remove ${HOME}/.wine/drive_c. +(Alternatively, just mount your Windows partition to ${HOME}/.wine/drive_c.) + +Wine bugs: +========== +If you find a bug, please take the time to move your ${HOME}/.wine directory +someplace and try with a fresh version (like mv ${HOME}/.wine{,-save}). If the +bug is still there look trough https://bugzilla.redhat.com and see if the bug +is already reported. In case it is not please report it. diff --git a/wine-notepad.desktop b/wine-notepad.desktop index fb9d815..6f9591c 100644 --- a/wine-notepad.desktop +++ b/wine-notepad.desktop @@ -5,4 +5,4 @@ Exec=notepad Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;System; +Categories=Application;Wine; diff --git a/wine-regedit.desktop b/wine-regedit.desktop index fd0c3c1..9a564da 100644 --- a/wine-regedit.desktop +++ b/wine-regedit.desktop @@ -5,4 +5,4 @@ Exec=regedit Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;System; +Categories=Application;Wine; diff --git a/wine-uninstaller.desktop b/wine-uninstaller.desktop index f75c319..ff8bcd5 100644 --- a/wine-uninstaller.desktop +++ b/wine-uninstaller.desktop @@ -5,4 +5,4 @@ Exec=uninstaller Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;System; +Categories=Application;Wine; diff --git a/wine-winecfg.desktop b/wine-winecfg.desktop index 3f27f5f..7650e93 100644 --- a/wine-winecfg.desktop +++ b/wine-winecfg.desktop @@ -5,4 +5,4 @@ Exec=winecfg Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;System; +Categories=Application;Wine; diff --git a/wine-winefile.desktop b/wine-winefile.desktop index 8ec2d4b..21a89fb 100644 --- a/wine-winefile.desktop +++ b/wine-winefile.desktop @@ -5,4 +5,4 @@ Exec=winefile Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;System; +Categories=Application;Wine; diff --git a/wine-winhelp.desktop b/wine-winhelp.desktop index 4f1ee4d..e964d69 100644 --- a/wine-winhelp.desktop +++ b/wine-winhelp.desktop @@ -5,4 +5,4 @@ Exec=winhelp Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;System; +Categories=Application;Wine; diff --git a/wine.init b/wine.init index 905eeff..275805c 100644 --- a/wine.init +++ b/wine.init @@ -11,10 +11,15 @@ RETVAL=0 start() { - echo -n $"Registering binary handler for Windows applications" - /sbin/modprobe binfmt_misc &>/dev/null - echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || : - echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || : +# fix bug on changing runlevels #213230 + if [ -e /proc/sys/fs/binfmt_misc/windows ]; then + echo -n $"Binary handler for Windows applications already registered" + else + echo -n $"Registering binary handler for Windows applications" + /sbin/modprobe binfmt_misc &>/dev/null + echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || : + echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || : + fi } stop() { diff --git a/wine.spec b/wine.spec index f75f38f..47c1f1b 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables Name: wine -Version: 0.9.24 +Version: 0.9.25 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,7 @@ Group: Applications/Emulators License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.24-fe.tar.bz2 +Source0: wine-0.9.25-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -515,7 +515,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/rpcrt4.dll.so %{_libdir}/wine/rsabase.dll.so %{_libdir}/wine/rsaenh.dll.so -%{_libdir}/wine/sane.ds.so %{_libdir}/wine/secur32.dll.so %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so @@ -657,6 +656,7 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so +%{_libdir}/wine/sane.ds.so %files capi %defattr(-,root,root,-) @@ -691,6 +691,13 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/*.def %changelog +* Thu Nov 16 2006 Andreas Bierfert +0.9.25-1 +- version upgrade +- fix init script (#213230) +- fix twain subpackage content (#213396) +- create wine submenu (#205024) + * Sat Oct 28 2006 Andreas Bierfert 0.9.24-1 - version upgrade