rpms/wine/FC-4 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 wine.spec, 1.24, 1.25

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- upgrade fc{3,4} as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	9 Jun 2006 10:14:18 -0000	1.16
+++ .cvsignore	4 Jul 2006 11:30:36 -0000	1.17
@@ -1 +1 @@
-wine-0.9.15-fe.tar.bz2
+wine-0.9.16-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Jun 2006 10:14:18 -0000	1.17
+++ sources	4 Jul 2006 11:30:36 -0000	1.18
@@ -1 +1 @@
-12d525c601068e0ee2b875b74b471c26  wine-0.9.15-fe.tar.bz2
+80cd252091082fbc9f0a57fc35e79877  wine-0.9.16-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine.spec	9 Jun 2006 10:14:18 -0000	1.24
+++ wine.spec	4 Jul 2006 11:30:36 -0000	1.25
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.15
+Version:	0.9.16
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -7,7 +7,7 @@
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.15-fe.tar.bz2
+Source0:        wine-0.9.16-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -47,12 +47,16 @@
 BuildRequires:  fontforge
 BuildRequires:  cups-devel
 
-Requires: /usr/X11R6/bin/xmessage
 
-Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
-Requires(post): /usr/bin/update-desktop-database
-Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
+Requires:       wine-core = %{version}-%{release}
+Requires:       wine-capi = %{version}-%{release}
+Requires:       wine-cms = %{version}-%{release}
+Requires:       wine-esd = %{version}-%{release}
+Requires:       wine-jack = %{version}-%{release}
+Requires:       wine-ldap = %{version}-%{release}
+Requires:       wine-nas = %{version}-%{release}
+Requires:       wine-tools = %{version}-%{release}
+Requires:       wine-twain = %{version}-%{release}
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -62,10 +66,29 @@
 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.
+
+%package core
+Summary:        Wine core package
+Group:		Applications/Emulators
+Requires:       %{_bindir}/xmessage
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
+Requires: /usr/X11R6/bin/xmessage
+Obsoletes:      wine <= 0.9.15-1%{?dist}
+
+%description core
+Wine core package includes the basic wine stuff needed by all other packages.
+
+
 %package tools
 Summary:        Additional wine tools
 Group:		Applications/Emulators
-Requires:       %{name} = %{version}-%{release}
+Requires:       wine-core = %{version}-%{release}
 
 %description tools
 Additional wine tools
@@ -73,7 +96,7 @@
 %package arts
 Summary: Arts sound support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description arts
 Arts sound support for wine
@@ -81,7 +104,7 @@
 %package esd
 Summary: ESD sound support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description esd
 ESD sound support for wine
@@ -89,7 +112,7 @@
 %package jack
 Summary: JACK sound support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description jack
 JACK sound support for wine
@@ -97,7 +120,7 @@
 %package nas
 Summary: NAS sound support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description nas
 JACK sound support for wine
@@ -105,7 +128,7 @@
 %package ldap
 Summary: LDAP support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description ldap
 LDAP support for wine
@@ -113,7 +136,7 @@
 %package cms
 Summary: Color Managment for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description cms
 Color Management for wine
@@ -121,7 +144,7 @@
 %package twain
 Summary: Twain support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description twain
 Twain support for wine
@@ -129,7 +152,7 @@
 %package capi
 Summary: ISDN support for wine
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description capi
 ISDN support for wine
@@ -137,7 +160,7 @@
 %package devel
 Summary: Wine development environment
 Group: System Environment/Libraries
-Requires: wine = %{version}-%{release}
+Requires: wine-core = %{version}-%{release}
 
 %description devel
 Header, include files and library definition files for developing applications
@@ -229,7 +252,7 @@
 %clean
 rm -rf %{buildroot}
 
-%post
+%post core
 /sbin/ldconfig
 update-desktop-database &>/dev/null || :
 if [ $1 = 1 ]; then
@@ -238,13 +261,13 @@
 /sbin/service wine start &>/dev/null || :
 fi
 
-%preun
+%preun core
 if [ $1 = 0 ]; then
 	/sbin/service wine stop >/dev/null 2>&1
 	/sbin/chkconfig --del wine
 fi
 
-%postun
+%postun core
 /sbin/ldconfig
 update-desktop-database &>/dev/null || :
 
@@ -274,6 +297,9 @@
 
 %files
 %defattr(-,root,root,-)
+
+%files core
+%defattr(-,root,root,-)
 %doc ANNOUNCE COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
 %doc AUTHORS README-Fedora README VERSION
 %doc documentation/*
@@ -337,6 +363,7 @@
 %{_libdir}/wine/comm.drv16
 %{_libdir}/wine/commdlg.dll16
 %{_libdir}/wine/compobj.dll16
+%{_libdir}/wine/compstui.dll.so
 %{_libdir}/wine/crtdll.dll.so
 %{_libdir}/wine/crypt32.dll.so
 %{_libdir}/wine/cryptdll.dll.so
@@ -386,6 +413,7 @@
 %{_libdir}/wine/imagehlp.dll.so
 %{_libdir}/wine/imm.dll16
 %{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/inseng.dll.so
 %{_libdir}/wine/iphlpapi.dll.so
 %{_libdir}/wine/itss.dll.so
 %{_libdir}/wine/joystick.drv.so
@@ -451,6 +479,7 @@
 %{_libdir}/wine/olepro32.dll.so
 %{_libdir}/wine/olesvr.dll16
 %{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/oleview.exe.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/psapi.dll.so
 %{_libdir}/wine/qcap.dll.so
@@ -638,6 +667,12 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jun 29 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.16-1
+- version upgrade
+- rename wine to wine-core
+- add meta package wine
+
 * Fri Jun 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15-1
 - version upgrade