rpms/wine/EL-5 wine-desktop-mime.patch, NONE, 1.1 .cvsignore, 1.44, 1.45 sources, 1.45, 1.46 wine.spec, 1.60, 1.61

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/wine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7175/EL-5

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-desktop-mime.patch 
Log Message:
- version upgrade
- several bugfixes


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/EL-5/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	11 Mar 2008 10:14:37 -0000	1.44
+++ .cvsignore	17 Jun 2008 19:10:07 -0000	1.45
@@ -1 +1 @@
-wine-0.9.57-fe.tar.bz2
+wine-1.0-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	11 Mar 2008 10:14:37 -0000	1.45
+++ sources	17 Jun 2008 19:10:07 -0000	1.46
@@ -1 +1 @@
-26fc25db994dc0563e7da12edd8596dc  wine-0.9.57-fe.tar.bz2
+8131688557a6168bf9248e48ee9e90ad  wine-1.0-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/wine.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- wine.spec	11 Mar 2008 10:14:37 -0000	1.60
+++ wine.spec	17 Jun 2008 19:10:07 -0000	1.61
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.57
+Version:	1.0
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -39,12 +39,14 @@
 # mime types
 Source300:      wine-mime-msi.desktop
 
-#enhancements
+# enhancements
 Source400:      wineshelllink-fedora
 Patch400:       wine-wineshelllink.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
@@ -65,13 +67,13 @@
 BuildRequires:  libxslt-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openldap-devel
+BuildRequires:  unixODBC-devel
 BuildRequires:  openssl-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fontforge
 BuildRequires:  gphoto2 gphoto2-devel
-BuildRequires:  unixODBC-devel
 BuildRequires:  jack-audio-connection-kit-devel
 #217338
 BuildRequires:  isdn4k-utils-devel
@@ -94,6 +96,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}
@@ -109,25 +112,35 @@
 Unixes. Wine does not require MS Windows, but it can use native system
 .dll files if they are available.
 
-In Fedora Extras wine is actually a meta-package which will install everything
-you need for wine to work smoothly. If you don't want to install everything
-take a look at the wine-* packages.
+In EPEL wine is a meta-package which will install everything needed for wine
+to work smoothly. If you do not want to install everything take a look at the
+wine-* packages.
 
 %package core
 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
@@ -205,6 +218,7 @@
 %setup -q -n %{name}-%{version}-fe
 %patch0
 %patch1
+%patch2
 %patch400
 
 %build
@@ -238,7 +252,7 @@
 %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
 mkdir -p %{buildroot}%{_datadir}/desktop-directories
 install -p -m 644 %{SOURCE201} \
-%{buildroot}%{_datadir}/desktop-directories/wine.directory
+%{buildroot}%{_datadir}/desktop-directories/Wine.directory
 
 
 # install desktop files
@@ -305,8 +319,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
@@ -314,14 +330,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
@@ -350,9 +365,9 @@
 
 %files core
 %defattr(-,root,root,-)
-%doc ANNOUNCE COPYING.LIB ChangeLog LICENSE LICENSE.OLD
+%doc ANNOUNCE COPYING.LIB LICENSE LICENSE.OLD
 %doc AUTHORS README-Fedora README VERSION
-# do not include huge changelogs .OLD .ALPHA (#204302)
+# do not include huge changelogs .OLD .ALPHA .BETA (#204302)
 %doc documentation/README.*
 %{_bindir}/msiexec
 %{_bindir}/regedit
@@ -367,17 +382,20 @@
 %{_bindir}/wineshelllink-fedora
 %{_bindir}/winecfg
 %{_bindir}/uninstaller
-%{_initrddir}/wine
 %{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/winhelp.exe16
+%{_libdir}/wine/winhlp32.exe.so
 %{_libdir}/wine/msiexec.exe.so
 %{_libdir}/wine/net.exe.so
 %{_libdir}/wine/ntoskrnl.exe.so
 %{_libdir}/wine/oleview.exe.so
+%{_libdir}/wine/reg.exe.so
 %{_libdir}/wine/regedit.exe.so
 %{_libdir}/wine/regsvr32.exe.so
 %{_libdir}/wine/rpcss.exe.so
 %{_libdir}/wine/rundll32.exe.so
 %{_libdir}/wine/secedit.exe.so
+%{_libdir}/wine/services.exe.so
 %{_libdir}/wine/start.exe.so
 %{_libdir}/wine/wineboot.exe.so
 %{_libdir}/wine/winebrowser.exe.so
@@ -388,25 +406,17 @@
 %{_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/*
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
 %{_bindir}/wine-kthread
 %{_bindir}/wine-preloader
 %{_bindir}/wine-pthread
-%{_bindir}/winelauncher
+# < 0.9.60
+#%{_bindir}/winelauncher
 %{_bindir}/wineserver
-%{_mandir}/man1/wineserver.1*
-%lang(de) %{_mandir}/de.UTF-8/man1/*
-%lang(fr) %{_mandir}/fr.UTF-8/man1/*
 %{_libdir}/libwine.so.1*
 %dir %{_libdir}/wine
 %{_libdir}/wine/acledit.dll.so
@@ -438,6 +448,7 @@
 %{_libdir}/wine/cryptdlg.dll.so
 %{_libdir}/wine/cryptdll.dll.so
 %{_libdir}/wine/cryptnet.dll.so
+%{_libdir}/wine/cryptui.dll.so
 %{_libdir}/wine/ctapi32.dll.so
 %{_libdir}/wine/ctl3d.dll16
 %{_libdir}/wine/ctl3d32.dll.so
@@ -479,6 +490,7 @@
 %{_libdir}/wine/dxdiagn.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/faultrep.dll.so
+%{_libdir}/wine/fusion.dll.so
 %{_libdir}/wine/gdi.exe16
 %{_libdir}/wine/gdi32.dll.so
 %{_libdir}/wine/gdiplus.dll.so
@@ -488,8 +500,8 @@
 %{_libdir}/wine/hid.dll.so
 %{_libdir}/wine/hh.exe.so
 %{_libdir}/wine/hlink.dll.so
-%{_libdir}/wine/hhctrl.ocx.so
 %{_libdir}/wine/hnetcfg.dll.so
+%{_libdir}/wine/hhctrl.ocx.so
 %{_libdir}/wine/iccvid.dll.so
 %{_libdir}/wine/icinfo.exe.so
 %{_libdir}/wine/icmp.dll.so
@@ -506,6 +518,7 @@
 %{_libdir}/wine/iphlpapi.dll.so
 %{_libdir}/wine/itircl.dll.so
 %{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/jscript.dll.so
 %{_libdir}/wine/kernel32.dll.so
 %{_libdir}/wine/keyboard.drv16
 %{_libdir}/wine/krnl386.exe16
@@ -711,7 +724,6 @@
 %{_bindir}/winemaker
 %{_bindir}/winemine
 %{_bindir}/winepath
-%{_bindir}/winhelp
 %{_libdir}/wine/explorer.exe.so
 %{_libdir}/wine/control.exe.so
 %{_libdir}/wine/cmd.exe.so
@@ -722,14 +734,25 @@
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
 %{_libdir}/wine/winepath.exe.so
-%{_libdir}/wine/winhelp.exe.so
 %{_libdir}/wine/winver.exe.so
-%{_libdir}/wine/write.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,-)
@@ -783,6 +806,7 @@
 %{_mandir}/man1/wrc.1*
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineg++.1*
+%lang(de) %{_mandir}/de.UTF-8/man1/wine.1*
 %{_datadir}/aclocal/wine.m4
 %attr(0755, root, root) %dir %{_includedir}/wine
 %{_includedir}/wine/*
@@ -790,6 +814,16 @@
 %{_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)
+
+* Mon Jun 16 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0-0.5.rc5
+- version upgrade
+
 * Tue Mar 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.57-1
 - version upgrade