packages: wine/wine.spec - updated to 1.1.42 - fixed %files -programs (list...

[charles]

Author: charles                      Date: Mon Apr 12 20:23:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.1.42
- fixed %files -programs (listed twice)

---- Files affected:
packages/wine:
   wine.spec (1.381 -> 1.382) 

---- Diffs:

================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.381 packages/wine/wine.spec:1.382
--- packages/wine/wine.spec:1.381	Sat Mar 20 15:37:37 2010
+++ packages/wine/wine.spec	Mon Apr 12 22:22:54 2010
@@ -30,13 +30,13 @@
 Summary(pl.UTF-8):	Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):	Executa programas Windows no Linux
 Name:		wine
-Version:	1.1.41
+Version:	1.1.42
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 Source0:	http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	6aac21d30239c2336254a46fd3c9aa2d
+# Source0-md5:	a4cd47db12a458cc0b548917d0dee64c
 Source1:	%{name}-uninstaller.desktop
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-makedep.patch
@@ -265,10 +265,6 @@
 %patch6 -p1
 %patch7 -p1
 
-# turn off compilation of some tools
-sed -i -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in
-#sed -i -e "s|avitools||" programs/Makefile.in
-
 %build
 %{__autoconf}
 %{__autoheader}
@@ -313,7 +309,6 @@
 	--with-x
 %{__make} depend
 %{__make}
-%{__make} -C programs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -322,9 +317,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C programs install \
-	DESTDIR=$RPM_BUILD_ROOT
-
 install tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir}
 
 install aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
@@ -368,7 +360,7 @@
 
 # /sbin/chstk -e $RPM_BUILD_ROOT%{_bindir}/wine
 
-programs="msiexec notepad regedit regsvr32 wineboot winecfg wineconsole winedbg winefile winemine winepath"
+programs="notepad regedit regsvr32 wineconsole winefile winemine winepath"
 
 BZZZ=`pwd`
 rm -f files.so;		touch files.so
@@ -536,6 +528,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.382  2010/04/12 20:22:54  charles
+- updated to 1.1.42
+- fixed %files -programs (listed twice)
+
 Revision 1.381  2010/03/20 14:37:37  charles
 - updated to 1.1.41
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wine/wine.spec?r1=1.381&r2=1.382&f=u