From 4bb94d8fc364fd12079c8827f3f8b22a15d5644a Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Jun 24 2009 10:53:30 +0000 Subject: - various fixes --- diff --git a/wine-notepad.desktop b/wine-notepad.desktop index f341041..fa5a1b1 100644 --- a/wine-notepad.desktop +++ b/wine-notepad.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=notepad +Name=Notepad Comment=Text Editor Exec=notepad Terminal=false diff --git a/wine-oleview.desktop b/wine-oleview.desktop new file mode 100644 index 0000000..906f084 --- /dev/null +++ b/wine-oleview.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Wine OLE View +Comment=Windows OLE View +Exec=wine oleview +Terminal=false +Type=Application +Encoding=UTF-8 +Categories=X-Wine; diff --git a/wine-regedit.desktop b/wine-regedit.desktop index 4b81843..7fb1c96 100644 --- a/wine-regedit.desktop +++ b/wine-regedit.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=regedit +Name=Regedit Comment=Wine registry editor Exec=regedit Terminal=false diff --git a/wine-wineboot.desktop b/wine-wineboot.desktop index 3b29f99..a29a3f6 100644 --- a/wine-wineboot.desktop +++ b/wine-wineboot.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=wineboot +Name=Wine Boot Comment=Simulate restart Exec=wineboot Terminal=false diff --git a/wine-winhelp.desktop b/wine-winhelp.desktop index c439c8a..b9f5285 100644 --- a/wine-winhelp.desktop +++ b/wine-winhelp.desktop @@ -1,7 +1,7 @@ [Desktop Entry] -Name=winhelp +Name=Wine Help Comment=Windows Help Browser -Exec=winhelp +Exec=wine winhlp32 Terminal=false Type=Application Encoding=UTF-8 diff --git a/wine-wordpad.desktop b/wine-wordpad.desktop new file mode 100644 index 0000000..d535956 --- /dev/null +++ b/wine-wordpad.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Wine Wordpad +Comment=Text Editor +Exec=wine wordpad +Terminal=false +Type=Application +Encoding=UTF-8 +Categories=X-Wine; diff --git a/wine.menu b/wine.menu index 8cfd94c..5fdb60f 100644 --- a/wine.menu +++ b/wine.menu @@ -4,7 +4,7 @@ Applications - Wine + wine-wine Wine.directory X-Wine diff --git a/wine.spec b/wine.spec index aa0ec3c..5113816 100644 --- a/wine.spec +++ b/wine.spec @@ -1,6 +1,6 @@ Name: wine Version: 1.1.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -31,6 +31,8 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop Source107: wine-wineboot.desktop +Source108: wine-wordpad.desktop +Source109: wine-oleview.desktop # desktop dir Source200: wine.menu @@ -106,7 +108,6 @@ Requires: wine-capi = %{version}-%{release} Requires: wine-cms = %{version}-%{release} Requires: wine-desktop = %{version}-%{release} Requires: wine-ldap = %{version}-%{release} -Requires: wine-nas = %{version}-%{release} Requires: wine-tools = %{version}-%{release} Requires: wine-twain = %{version}-%{release} Requires: wine-pulseaudio = %{version}-%{release} @@ -132,6 +133,8 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: wine <= 0.9.15-1%{?dist} Obsoletes: wine-arts < 0.9.34 +# fix dns resolution (#492700) +Requires: nss-mdns%{_isa} %description core Wine core package includes the basic wine stuff needed by all other packages. @@ -232,6 +235,22 @@ Requires: wine-core = %{version}-%{release} This package adds a native pulseaudio driver for wine. This is not an official wine audio driver. Please do not report bugs regarding this driver at winehq.org. +%package alsa +Summary: Alsa support for wine +Group: System Environment/Libraries +Requires: wine-core = %{version}-%{release} + +%description alsa +This package adds an alsa driver for wine. + +%package oss +Summary: OSS support for wine +Group: System Environment/Libraries +Requires: wine-core = %{version}-%{release} + +%description oss +This package adds an oss driver for wine. + %prep %setup -q -n %{name}-%{version}-fe %patch1 @@ -321,6 +340,16 @@ desktop-file-install \ desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE108} + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE109} + +desktop-file-install \ + --vendor=fedora \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop @@ -383,8 +412,18 @@ update-desktop-database &>/dev/null || : %post capi -p /sbin/ldconfig %postun capi -p /sbin/ldconfig +%post pulseaudio -p /sbin/ldconfig +%postun pulseaudio -p /sbin/ldconfig + +%post alsa -p /sbin/ldconfig +%postun alsa -p /sbin/ldconfig + +%post oss -p /sbin/ldconfig +%postun oss -p /sbin/ldconfig + %files %defattr(-,root,root,-) +# meta package %files core %defattr(-,root,root,-) @@ -678,7 +717,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/windowscodecs.dll.so %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so -%{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winecoreaudio.drv.so %{_libdir}/wine/winejoystick.drv.so %{_libdir}/wine/winex11.drv.so @@ -705,7 +743,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so %{_datadir}/wine/fonts/ -%{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so @@ -787,16 +824,19 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/write.exe.so %files desktop +%defattr(-,root,root,-) %{_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}/applications/fedora-wine-winhelp.desktop +%{_datadir}/applications/fedora-wine-wordpad.desktop +%{_datadir}/applications/fedora-wine-oleview.desktop %{_datadir}/desktop-directories/Wine.directory %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine @@ -860,16 +900,35 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/*.def %files pulseaudio +%defattr(-,root,root,-) # winepulse documentation %doc README-FEDORA-PULSEAUDIO %{_libdir}/wine/winepulse.drv.so +%files alsa +%defattr(-,root,root,-) +%{_libdir}/wine/winealsa.drv.so + +%files oss +%defattr(-,root,root,-) +%{_libdir}/wine/wineoss.drv.so + %changelog +* Sun Jun 21 2009 Andreas Bierfert +- 1.1.24-2 +- adjust wine-menu to follow wine behavior (wine-wine instead of Wine) + (fixes #479649, #495953) +- fix wine help desktop entry (#495953, #507154) +- add some more wine application desktop entries (#495953) +- split alsa/oss support into wine-alsa/wine-oss +- drop nas require from wine meta package +- fix dns resolution (#492700) + * Fri Jun 19 2009 Andreas Bierfert - 1.1.24-1 - version upgrade - WinePulse 0.28 -- drop meta package requires for jack and esd +- drop meta package requires for jack and esd (#492983) * Wed Jun 10 2009 Andreas Bierfert - 1.1.23-1