packages (DEVEL): wine/wine.spec - up to 1.3.16 - gecko new version is 1.2....

[lisu]

Author: lisu                         Date: Mon Mar 21 13:33:16 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 1.3.16
- gecko new version is 1.2.0
- add gecko for x86_64
- -notarget.patch is obsoleted

---- Files affected:
packages/wine:
   wine.spec (1.391.2.23 -> 1.391.2.24) 

---- Diffs:

================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.391.2.23 packages/wine/wine.spec:1.391.2.24
--- packages/wine/wine.spec:1.391.2.23	Sat Mar  5 22:11:58 2011
+++ packages/wine/wine.spec	Mon Mar 21 14:33:11 2011
@@ -31,24 +31,25 @@
 Summary(pl.UTF-8):	Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):	Executa programas Windows no Linux
 Name:		wine
-Version:	1.3.15
+Version:	1.3.16
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 Source0:	http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	5ddc07f0a1c7b05f4cf52292aafc98e3
-Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-1.1.0-x86.cab
-# Source1-md5:	7217cb91106f2efd85d6d1a84f5ee305
-Source2:	%{name}-uninstaller.desktop
+# Source0-md5:	74627787556240473a85daaf51d4f620
+Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-1.2.0-x86.msi
+# Source1-md5:	f2ed548494c86c511892b1c02491c8c4
+Source2:	http://downloads.sourceforge.net/wine/%{name}_gecko-1.2.0-x86_64.msi
+# Source2-md5:	26489d8d1dfa34b5783b3e567edcaa9f
+Source3:	%{name}-uninstaller.desktop
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-makedep.patch
 Patch2:		%{name}-ncurses.patch
 Patch4:		%{name}-disable-valgrind.patch
 Patch5:		%{name}-ca_certificates.patch
-Patch6:		%{name}-notarget.patch
-Patch7:		%{name}-manpaths.patch
-Patch8:		desktop.patch
+Patch6:		%{name}-manpaths.patch
+Patch7:		desktop.patch
 URL:		http://www.winehq.org/
 BuildRequires:	OpenAL-devel >= 1.1
 BuildRequires:	OpenGL-GLU-devel
@@ -288,7 +289,6 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 icotool -x --width=32 --height=32 --bit-depth=32 -o . dlls/user32/resources/oic_winlogo.ico
@@ -414,10 +414,14 @@
 done
 
 install -d $RPM_BUILD_ROOT%{_winedir}/gecko
+%ifnarch %{x8664}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
+%else
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_winedir}/gecko
+%endif
 
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 cp -a %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
@@ -590,6 +594,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.391.2.24  2011/03/21 13:33:11  lisu
+- up to 1.3.16
+- gecko new version is 1.2.0
+- add gecko for x86_64
+- -notarget.patch is obsoleted
+
 Revision 1.391.2.23  2011/03/05 21:11:58  lisu
 - up to 1.3.15
 
================================================================

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