X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wine.spec;h=7a384fd658fdaaf776ffa8f8a953f136aae1ffe6;hb=f29d6a4f5a4651b5db0ddc598a11f75012988857;hp=2ddcfdf6b7e2f71c4883fd84cef63041ce887b4e;hpb=9812f75ba324ee7ca261a7cfa2cd3021a14520eb;p=packages%2Fwine.git

diff --git a/wine.spec b/wine.spec
index 2ddcfdf..7a384fd 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_without	alsa		# don't build ALSA mm driver
+%bcond_with	esd		# build ESD mm driver
 %bcond_without	jack		# don't build JACK mm driver
 %bcond_without	nas		# don't build NAS mm driver
 %bcond_without	sane		# don't build TWAIN DLL with scanning support (through SANE)
@@ -24,19 +25,22 @@
 %if %{without alsa}
 %undefine	with_jack
 %endif
+
 Summary:	Program that lets you launch Win applications
 Summary(es.UTF-8):	Ejecuta programas Windows en Linux
 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.17
-Release:	1
+Version:	1.2.2
+Release:	4
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 Source0:	http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	ad73833f304e6c6e4d827989ff75db3d
-Source1:	%{name}-uninstaller.desktop
+# Source0-md5:	e976d64688e0833061e79efa3eac5d2c
+Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-1.0.0-x86.cab
+# Source1-md5:	9c5c335fc077c0558561afaf25a09e51
+Source2:	%{name}-uninstaller.desktop
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-makedep.patch
 Patch2:		%{name}-ncurses.patch
@@ -44,8 +48,10 @@ Patch4:		%{name}-disable-valgrind.patch
 Patch5:		%{name}-ca_certificates.patch
 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
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	artsc-devel}
@@ -55,6 +61,7 @@ BuildRequires:	bison
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-utils
+%{?with_esd:BuildRequires:	esound-devel}
 BuildRequires:	flex
 BuildRequires:	fontconfig-devel
 BuildRequires:	fontforge
@@ -62,11 +69,15 @@ BuildRequires:	freetype-devel >= 2.0.5
 BuildRequires:	giflib-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	hal-devel
+BuildRequires:	icoutils
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	lcms-devel
 BuildRequires:	libgphoto2-devel
+BuildRequires:	libgsm-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	libmpg123-devel >= 1.5.0
 BuildRequires:	libtool
+BuildRequires:	libv4l-devel
 BuildRequires:	libxslt-devel
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	ncurses-devel
@@ -88,10 +99,16 @@ BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
+%ifarch %{x8664}
+Requires:	libfreetype.so.6()(64bit)
+%else
 Requires:	libfreetype.so.6
+%endif
 Suggests:	binfmt-detector
 Suggests:	ca-certificates
 Conflicts:	ca-certificates < 20080809-4
+# for printing needs lpr
+Suggests:	cups-clients
 # for winelauncher
 Suggests:	xorg-app-xmessage
 # for ntlm_auth
@@ -100,7 +117,7 @@ Suggests:	samba-common >= 1:3.0.25
 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)
 
@@ -228,7 +245,11 @@ Group:		Applications/Emulators
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	jack-audio-connection-kit
 # dlopened by SONAME detected at build time
+%ifarch %{x8664}
+%{?with_jack:Requires:  %{getsoname /usr/%{_lib}/libjack.so}()(64bit)}
+%else
 %{?with_jack:Requires:	%{getsoname /usr/%{_lib}/libjack.so}}
+%endif
 
 %description drv-jack
 JACK driver for WINE mm.dll (multimedia system) implementation.
@@ -258,34 +279,43 @@ Sterownik NAS dla implementacji mm.dll (systemu multimediów) w Wine.
 %patch5 -p1
 %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
+%patch8 -p1
 
 %build
+icotool -x --width=32 --height=32 --bit-depth=32 -o . dlls/user32/resources/oic_winlogo.ico
+mv -f oic_winlogo_*.png %{name}.png
+
 %{__autoconf}
 %{__autoheader}
 %configure \
+%ifarch %{x8664}
+	--enable-win64 \
+%endif
 	--with%{!?with_alsa:out}-alsa \
+	--with-audioio \
+	--without-capi \
 	--with-cms \
+	--with-coreaudio \
 	--with%{!?with_cups:out}-cups \
-	--with-cups \
 	--with-curses \
-	--with-esd \
+	--with%{!?with_esd:out}-esd \
 	--with-fontconfig \
 	--with-freetype \
 	--with-glu \
+	--with-gnutls \
 	--with-gphoto \
+	--with-gsm \
 	--with-hal \
 	--with%{!?with_jack:out}-jack \
 	--with-jpeg \
 	--with-ldap \
+	--with-mpg123 \
 	--with%{!?with_nas:out}-nas \
 	--with-opengl \
 	--with-openssl \
 	--with-oss \
 	--with-png \
+	--with-pthread \
 	--with%{!?with_sane:out}-sane \
 	--with-xcomposite \
 	--with-xcursor \
@@ -301,21 +331,15 @@ sed -i -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in
 	--with-x
 %{__make} depend
 %{__make}
-%{__make} -C programs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
-
 %{__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
+install -p tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir}
+cp -a aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
 
 install -d \
 	$RPM_BUILD_ROOT%{_winedir}/windows/{system,Desktop,Favorites,Fonts} \
@@ -356,31 +380,35 @@ fi
 
 # /sbin/chstk -e $RPM_BUILD_ROOT%{_bindir}/wine
 
-programs="msiexec notepad regedit regsvr32 wineboot winecfg wineconsole winedbg winefile winemine winepath"
-
-BZZZ=`pwd`
-rm -f files.so;		touch files.so
-rm -f files.programs;	touch files.programs
+dir=$(pwd)
+> files.so
+> files.programs
 cd $RPM_BUILD_ROOT%{_libdir}/wine
 for f in *.so; do
 	case $f in
-		d3d8.dll.so|d3d9.dll.so|d3dx8.dll.so|glu32.dll.so|opengl32.dll.so|sane.ds.so|twain.dll.so|twain_32.dll.so|winealsa.drv.so|winejack.drv.so|winenas.drv.so)
-			;;
-		*)
-			echo "%attr(755,root,root) %{_libdir}/wine/$f" >>$BZZZ/files.so
+	d3d8.dll.so|d3d9.dll.so|d3dx8.dll.so|glu32.dll.so|opengl32.dll.so|sane.ds.so|twain.dll.so|twain_32.dll.so|winealsa.drv.so|winejack.drv.so|winenas.drv.so)
+		;;
+	*)
+		echo "%attr(755,root,root) %{_libdir}/wine/$f" >> $dir/files.so
 	esac
 done
 cd -
+
+programs="notepad regedit regsvr32 wineconsole winefile winemine winepath"
 for p in $programs; do
 	echo "%attr(755,root,root) %{_bindir}/$p" >> files.programs
 	echo "%attr(755,root,root) %{_libdir}/wine/$p.exe.so" >> files.programs
+	echo "%{_mandir}/man1/$p.1*" >> files.programs
 	grep -v "$p\.exe\.so$" files.so > files.so.
 	mv -f files.so. files.so
 done
 
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}/wine.svg
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install programs/winetest/winetest.svg $RPM_BUILD_ROOT%{_pixmapsdir}/wine.svg
+install -d $RPM_BUILD_ROOT%{_winedir}/gecko
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
+
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -400,38 +428,59 @@ fi
 %lang(de) %doc documentation/README.de
 %lang(es) %doc documentation/README.es
 %lang(fr) %doc documentation/README.fr
+%lang(hu) %doc documentation/README.hu
 %lang(it) %doc documentation/README.it
 %lang(ko) %doc documentation/README.ko
 %lang(nb) %doc documentation/README.no
 %lang(pt) %doc documentation/README.pt
 %lang(pt_BR) %doc documentation/README.pt_br
+%lang(ru) %doc documentation/README.ru
+%lang(sv) %doc documentation/README.sv
+%lang(tr) %doc documentation/README.tr
 %attr(755,root,root) %{_bindir}/msiexec
-%attr(755,root,root) %{_bindir}/wine
 %attr(755,root,root) %{_bindir}/wineboot
-%attr(755,root,root) %{_bindir}/winecfg
 %attr(755,root,root) %{_bindir}/winedbg
-%attr(755,root,root) %{_bindir}/wine-kthread
-#%attr(755,root,root) %{_bindir}/winelauncher
-%attr(755,root,root) %{_bindir}/wineprefixcreate
-%attr(755,root,root) %{_bindir}/wine-preloader
-%attr(755,root,root) %{_bindir}/wine-pthread
+%attr(755,root,root) %{_bindir}/winecfg
 %attr(755,root,root) %{_bindir}/wineserver
+%ifarch %{x8664}
+%attr(755,root,root) %{_bindir}/wine64
+%else
+%attr(755,root,root) %{_bindir}/wine
+%attr(755,root,root) %{_bindir}/wine-preloader
+%endif
 %attr(755,root,root) %{_libdir}/*.so*
 %dir %{_libdir}/wine
-%{_libdir}/wine/*.dll16
-%{_libdir}/wine/*.drv16
-%{_libdir}/wine/*.exe16
+%dir %{_libdir}/wine/fakedlls
+%{_libdir}/wine/fakedlls/*.acm
+%{_libdir}/wine/fakedlls/*.cpl
+%{_libdir}/wine/fakedlls/*.dll
+%{_libdir}/wine/fakedlls/*.drv
+%{_libdir}/wine/fakedlls/*.ds
+%{_libdir}/wine/fakedlls/*.exe
+%{_libdir}/wine/fakedlls/*.ocx
+%{_libdir}/wine/fakedlls/*.sys
+%{_libdir}/wine/fakedlls/*.tlb
+%ifarch %{ix86}
+%{_libdir}/wine/fakedlls/*.dll16
+%{_libdir}/wine/fakedlls/*.drv16
+%{_libdir}/wine/fakedlls/*.exe16
+%{_libdir}/wine/fakedlls/*.mod16
+%{_libdir}/wine/fakedlls/*.vxd
+%endif
 %{_mandir}/man1/wine.1*
+%{_mandir}/man1/msiexec.1*
+%{_mandir}/man1/wineboot.1*
+%{_mandir}/man1/winecfg.1*
 %lang(de) %{_mandir}/de/man1/wine.1*
 %lang(fr) %{_mandir}/fr/man1/wine.1*
 %{_mandir}/man1/winedbg.1*
-%{_mandir}/man1/wineprefixcreate.1*
 %{_mandir}/man1/wineserver.1*
+%lang(de) %{_mandir}/de/man1/wineserver.1*
 %lang(fr) %{_mandir}/fr/man1/wineserver.1*
 %{_winedir}
 %{_desktopdir}/wine.desktop
 %{_desktopdir}/wine-uninstaller.desktop
-%{_pixmapsdir}/wine.svg
+%{_pixmapsdir}/%{name}.png
 
 %files programs -f files.programs
 %defattr(644,root,root,755)
@@ -447,7 +496,6 @@ fi
 %attr(755,root,root) %{_bindir}/winegcc
 %attr(755,root,root) %{_bindir}/winemaker
 %attr(755,root,root) %{_bindir}/winecpp
-#%attr(755,root,root) %{_bindir}/winewrap
 %attr(755,root,root) %{_bindir}/wmc
 %attr(755,root,root) %{_bindir}/wrc
 %{_libdir}/wine/lib*.def
@@ -460,11 +508,14 @@ fi
 %{_libdir}/wine/libwinecrt0.a
 %{_includedir}/wine
 %{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winecpp.1*
 %{_mandir}/man1/winedump.1*
 %{_mandir}/man1/winegcc.1*
 %{_mandir}/man1/wineg++.1*
 %{_mandir}/man1/winemaker.1*
-%{_mandir}/man1/winebuild.1*
+%lang(de) %{_mandir}/de/man1/winemaker.1*
+%lang(fr) %{_mandir}/fr/man1/winemaker.1*
 %{_mandir}/man1/wmc.1*
 %{_mandir}/man1/wrc.1*
 %{_aclocaldir}/*.m4
@@ -473,7 +524,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/wine/d3d8.dll.so
 %attr(755,root,root) %{_libdir}/wine/d3d9.dll.so
-%attr(755,root,root) %{_libdir}/wine/d3dx8.dll.so
 %attr(755,root,root) %{_libdir}/wine/wined3d.dll.so
 
 %files dll-gl