SPECS: wine.spec - R: binfmt-detector - TODO: properly remove wine...

[wolf]

Author: wolf                         Date: Mon May  1 16:06:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R: binfmt-detector
- TODO: properly remove wine service
- rel 1.9

---- Files affected:
SPECS:
   wine.spec (1.233 -> 1.234) 

---- Diffs:

================================================================
Index: SPECS/wine.spec
diff -u SPECS/wine.spec:1.233 SPECS/wine.spec:1.234
--- SPECS/wine.spec:1.233	Sun Apr 16 13:44:18 2006
+++ SPECS/wine.spec	Mon May  1 18:06:23 2006
@@ -29,7 +29,7 @@
 Summary(pt_BR):	Executa programas Windows no Linux
 Name:		wine
 Version:	0.9.12
-Release:	1
+Release:	1.9
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
@@ -37,7 +37,6 @@
 #Source0:	ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-%{version}.tar.gz
 Source0:	http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
 # Source0-md5:	f7668e17e731b59c837dfee218554171
-Source1:	%{name}.init
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-makedep.patch
 Patch2:		%{name}-alsa.patch
@@ -77,6 +76,7 @@
 BuildRequires:	xorg-lib-libXxf86vm-devel
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
+Requires:	binfmt-detector
 # link to wine/ntdll.dll.so, without any SONAME
 Provides:	libntdll.dll.so
 ExclusiveArch:	%{ix86}
@@ -275,15 +275,13 @@
 install aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
 #mv -f $RPM_BUILD_ROOT{/usr/X11R6/share/aclocal,%{_aclocaldir}}/wine.m4
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d \
+install -d \
 	$RPM_BUILD_ROOT%{_winedir}/windows/{system,Desktop,Favorites,Fonts} \
 	"$RPM_BUILD_ROOT%{_winedir}/windows/Start Menu/Programs/Startup" \
 	$RPM_BUILD_ROOT%{_winedir}/windows/{SendTo,ShellNew,system32,NetHood} \
 	$RPM_BUILD_ROOT%{_winedir}/windows/{Profiles/Administrator,Recent} \
 	$RPM_BUILD_ROOT%{_winedir}/{"Program Files/Common Files","My Documents"}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wine
-
 touch $RPM_BUILD_ROOT%{_winedir}/{autoexec.bat,config.sys,windows/win.ini}
 touch $RPM_BUILD_ROOT%{_winedir}/windows/system/{shell.dll,shell32.dll}
 touch $RPM_BUILD_ROOT%{_winedir}/windows/system/{winsock.dll,wsock32.dll}
@@ -343,18 +341,15 @@
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add wine
-if [ ! -f /var/lock/subsys/wine ]; then
-	echo "Run \"/etc/rc.d/init.d/wine start\" to start wine service." >&2
-fi
 
-%preun
-if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/wine ]; then
-		/etc/rc.d/init.d/wine stop >&2
-	fi
-	/sbin/chkconfig --del wine
-fi
+# how to remove this correctly?
+#%preun
+#if [ "$1" = "0" ]; then
+#	if [ -f /var/lock/subsys/wine ]; then
+#		/etc/rc.d/init.d/wine stop >&2
+#	fi
+#	/sbin/chkconfig --del wine
+#fi
 
 %postun -p /sbin/ldconfig
 
@@ -390,7 +385,6 @@
 %{_mandir}/man1/wine.*
 %{_mandir}/man1/winedbg.1*
 %{_mandir}/man1/wineserver.*
-%attr(754,root,root) /etc/rc.d/init.d/wine
 %{_winedir}
 %{_desktopdir}/wine.desktop
 
@@ -481,6 +475,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.234  2006/05/01 16:06:23  wolf
+- R: binfmt-detector
+- TODO: properly remove wine service
+- rel 1.9
+
 Revision 1.233  2006/04/16 11:44:18  wolf
 - 0.9.12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wine.spec?r1=1.233&r2=1.234&f=u