rpms/wine/FC-3 wine.directory, NONE, 1.1 wine.menu, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 wine.spec, 1.29, 1.30

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4531/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine.directory wine.menu 
Log Message:
- version upgrade (#220130)
- fix submenus (#216076)
- fix BR (#217338)



--- NEW FILE wine.directory ---
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=Wine
Icon=gnome-util.png


--- NEW FILE wine.menu ---
<!DOCTYPE Menu
  PUBLIC '-//freedesktop//DTD Menu 1.0//EN'
  'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'>
<Menu>
	<Name>Applications</Name>
	<Menu>
		<Name>Wine</Name>
		<Directory>Wine.directory</Directory>
		<Include>
			<Category>Wine</Category>
		</Include>
	</Menu>
</Menu>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	28 Oct 2006 05:51:27 -0000	1.21
+++ .cvsignore	19 Dec 2006 15:10:46 -0000	1.22
@@ -1 +1 @@
-wine-0.9.24-fe.tar.bz2
+wine-0.9.27-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	28 Oct 2006 05:51:27 -0000	1.22
+++ sources	19 Dec 2006 15:10:46 -0000	1.23
@@ -1 +1 @@
-1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2
+b5e45cfbdc969304192b2d689e1affa6  wine-0.9.27-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wine.spec	28 Oct 2006 05:51:27 -0000	1.29
+++ wine.spec	19 Dec 2006 15:10:46 -0000	1.30
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.24
+Version:	0.9.27
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,10 +7,11 @@
 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.27-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
+# desktop stuff
 Source100:      wine-notepad.desktop
 Source101:      wine-regedit.desktop
 Source102:      wine-uninstaller.desktop
@@ -18,6 +19,9 @@
 Source104:      wine-winefile.desktop
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
+# desktop dir
+Source200:      wine.menu
+Source201:      wine.directory
 Patch0:         wine-prefixfonts.patch
 Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +49,8 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fontforge
+BuildRequires:  gphoto2 gphoto2-devel
+BuildRequires:  isdn4k-utils-devel
 BuildRequires:  cups-devel
 
 
@@ -192,8 +198,17 @@
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
 mkdir -p %{buildroot}%{_initrddir}
-install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
+install -p -c -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/wine
 
+# add wine dir to desktop
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+install -p -m 644 %{SOURCE200} \
+%{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
+
+# install desktop files
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -335,6 +350,8 @@
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
 %{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_datadir}/desktop-directories/wine.directory
+%{_sysconfdir}/xdg/menus/applications-merged/wine.menu
 %{_mandir}/man1/wine.1.gz
 %dir %{_datadir}/wine
 %{_datadir}/wine/generic.ppd
@@ -508,6 +525,7 @@
 %{_libdir}/wine/serialui.dll.so
 %{_libdir}/wine/setupapi.dll.so
 %{_libdir}/wine/setupx.dll16
+%{_libdir}/wine/shdoclc.dll.so
 %{_libdir}/wine/shdocvw.dll.so
 %{_libdir}/wine/shell.dll16
 %{_libdir}/wine/shell32.dll.so
@@ -580,7 +598,6 @@
 %{_libdir}/wine/d3d9.dll.so
 %{_libdir}/wine/d3dx8.dll.so
 %{_libdir}/wine/glu32.dll.so
-%{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
 %{_libdir}/wine/dnsapi.dll.so
@@ -678,6 +695,15 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Dec 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.27-1
+- version upgrade (#220130)
+- fix submenus (#216076)
+- fix BR (#217338)
+- fix init script (#213230)
+- fix twain subpackage content (#213396)
+- create wine submenu (#205024)
+
 * Sat Oct 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.24-1
 - version upgrade