packages (DEVEL): wine/wine.spec - up to 1.3.14 - added x8664 as second Exc...

[evil]

Author: evil                         Date: Sat Feb 19 22:04:07 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 1.3.14
- added x8664 as second ExclusiveArch, and added rules allowing building wine64(Win64/PE64 compatible)
- cosmetic fixes

---- Files affected:
packages/wine:
   wine.spec (1.391.2.20 -> 1.391.2.21) 

---- Diffs:

================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.391.2.20 packages/wine/wine.spec:1.391.2.21
--- packages/wine/wine.spec:1.391.2.20	Mon Feb  7 09:00:04 2011
+++ packages/wine/wine.spec	Sat Feb 19 23:04:02 2011
@@ -37,14 +37,14 @@
 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.13
-Release:	0.1
+Version:	1.3.14
+Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 Source0:	http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	e6d4cd7e51678f90760e2193893637aa
-Source1:	http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab
+# Source0-md5:	c99c8f518d3b2a13a739dfbd6c417e80
+Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-1.1.0-x86.cab
 # Source1-md5:	7217cb91106f2efd85d6d1a84f5ee305
 Source2:	%{name}-uninstaller.desktop
 Patch0:		%{name}-fontcache.patch
@@ -55,7 +55,6 @@
 Patch6:		%{name}-notarget.patch
 Patch7:		%{name}-manpaths.patch
 Patch8:		desktop.patch
-#PatchX:	%{name}-dga.patch
 URL:		http://www.winehq.org/
 BuildRequires:	OpenAL-devel >= 1.1
 BuildRequires:	OpenGL-GLU-devel
@@ -123,7 +122,7 @@
 Provides:	libntdll.dll.so
 Obsoletes:	wine-doc-pdf
 Obsoletes:	wine-drv-arts
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664}
 ExcludeArch:	i386
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -251,7 +250,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	jack-audio-connection-kit
 # dlopened by SONAME detected at build time
-%{?with_jack:Requires:	%{getsoname /usr/%{_lib}/libjack.so}}
+%{?with_jack:Requires:	%{getsoname %{_libdir}/libjack.so}}
 
 %description drv-jack
 JACK driver for WINE mm.dll (multimedia system) implementation.
@@ -290,6 +289,9 @@
 %{__autoconf}
 %{__autoheader}
 %configure \
+%ifarch %{x8664}
+	--enable-win64 \
+%endif
 	--with%{!?with_alsa:out}-alsa \
 	--with-audioio \
 	--without-capi \
@@ -438,11 +440,19 @@
 %lang(sv) %doc documentation/README.sv
 %lang(tr) %doc documentation/README.tr
 %attr(755,root,root) %{_bindir}/msiexec
+%ifnarch %{x8664}
 %attr(755,root,root) %{_bindir}/wine
+%else
+%attr(755,root,root) %{_bindir}/wine64
+%endif
 %attr(755,root,root) %{_bindir}/wineboot
 %attr(755,root,root) %{_bindir}/winedbg
 %attr(755,root,root) %{_bindir}/winecfg
+%ifnarch %{x8664}
 %attr(755,root,root) %{_bindir}/wine-preloader
+%else
+%attr(755,root,root) %{_bindir}/wine64-preloader
+%endif
 %attr(755,root,root) %{_bindir}/wineserver
 %attr(755,root,root) %{_libdir}/*.so*
 %dir %{_libdir}/wine
@@ -450,17 +460,25 @@
 %{_libdir}/wine/fakedlls/*.acm
 %{_libdir}/wine/fakedlls/*.cpl
 %{_libdir}/wine/fakedlls/*.dll
+%ifarch %{ix86}
 %{_libdir}/wine/fakedlls/*.dll16
+%endif
 %{_libdir}/wine/fakedlls/*.drv
+%ifarch %{ix86}
 %{_libdir}/wine/fakedlls/*.drv16
+%endif
 %{_libdir}/wine/fakedlls/*.ds
 %{_libdir}/wine/fakedlls/*.exe
+%ifarch %{ix86}
 %{_libdir}/wine/fakedlls/*.exe16
 %{_libdir}/wine/fakedlls/*.mod16
+%endif
 %{_libdir}/wine/fakedlls/*.ocx
 %{_libdir}/wine/fakedlls/*.sys
 %{_libdir}/wine/fakedlls/*.tlb
+%ifarch %{ix86}
 %{_libdir}/wine/fakedlls/*.vxd
+%endif
 %{_mandir}/man1/wine.1*
 %lang(de) %{_mandir}/de/man1/wine*.1*
 %lang(fr) %{_mandir}/fr/man1/wine*.1*
@@ -560,6 +578,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.391.2.21  2011/02/19 22:04:02  evil
+- up to 1.3.14
+- added x8664 as second ExclusiveArch, and added rules allowing building wine64(Win64/PE64 compatible)
+- cosmetic fixes
+
 Revision 1.391.2.20  2011/02/07 08:00:04  lisu
 - rel 0.1
 - TODO
================================================================

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