X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wine.spec;h=de4a43f42cd671797ee3e885284c650d44bdb6bc;hb=c1b46ddc0cdd0f0190db436ff10c70e23c5ccdff;hp=3940a32bc3022120fd2439af379508d95c6c3811;hpb=182f1b504936270a37f1e30979225e378dbf5412;p=packages%2Fwine.git

diff --git a/wine.spec b/wine.spec
index 3940a32..de4a43f 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,26 +25,30 @@
 %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.8
+Version:	1.2
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 Source0:	http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	3a65ee3448b80519d1aa606d3bba92be
+# Source0-md5:	eb4e5423b277fc1e77807b04f366f7b7
 Source1:	%{name}-uninstaller.desktop
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-makedep.patch
 Patch2:		%{name}-ncurses.patch
-Patch3:		%{name}-bug9177_workaround.patch
 Patch4:		%{name}-disable-valgrind.patch
+Patch5:		%{name}-ca_certificates.patch
+Patch6:		%{name}-notarget.patch
+Patch7:		%{name}-manpaths.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}
@@ -53,6 +58,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
@@ -63,8 +69,11 @@ BuildRequires:	hal-devel
 %{?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
@@ -75,6 +84,7 @@ BuildRequires:	opensp >= 1:1.5.1
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig
 %{?with_sane:BuildRequires:	sane-backends-devel}
+BuildRequires:	unixODBC-devel >= 2.2.12-2
 #BuildRequires:	valgrind
 BuildRequires:	xorg-lib-libXcomposite-devel
 BuildRequires:	xorg-lib-libXcursor-devel
@@ -85,7 +95,12 @@ BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
+Requires:	libfreetype.so.6
 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
@@ -248,36 +263,40 @@ Sterownik NAS dla implementacji mm.dll (systemu multimediów) w Wine.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -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
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__autoconf}
 %{__autoheader}
 %configure \
 	--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 \
@@ -293,7 +312,6 @@ sed -i -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in
 	--with-x
 %{__make} depend
 %{__make}
-%{__make} -C programs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -302,10 +320,7 @@ 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 tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir}
 
 install aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
 
@@ -348,7 +363,7 @@ fi
 
 # /sbin/chstk -e $RPM_BUILD_ROOT%{_bindir}/wine
 
-programs="msiexec notepad progman regedit regsvr32 uninstaller wineboot winebrowser winecfg wineconsole winedbg winefile winemine winepath"
+programs="notepad regedit regsvr32 wineconsole winefile winemine winepath"
 
 BZZZ=`pwd`
 rm -f files.so;		touch files.so
@@ -392,34 +407,46 @@ 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}/winebrowser
-%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}/winecfg
 %attr(755,root,root) %{_bindir}/wine-preloader
-%attr(755,root,root) %{_bindir}/wine-pthread
 %attr(755,root,root) %{_bindir}/wineserver
-%attr(755,root,root) %{_bindir}/wineshelllink
 %attr(755,root,root) %{_libdir}/*.so*
 %dir %{_libdir}/wine
-%{_libdir}/wine/*.dll16
-%{_libdir}/wine/*.drv16
-%{_libdir}/wine/*.exe16
-%{_libdir}/wine/*.mod16
+%dir %{_libdir}/wine/fakedlls
+%{_libdir}/wine/fakedlls/*.acm
+%{_libdir}/wine/fakedlls/*.cpl
+%{_libdir}/wine/fakedlls/*.dll
+%{_libdir}/wine/fakedlls/*.dll16
+%{_libdir}/wine/fakedlls/*.drv
+%{_libdir}/wine/fakedlls/*.drv16
+%{_libdir}/wine/fakedlls/*.ds
+%{_libdir}/wine/fakedlls/*.exe
+%{_libdir}/wine/fakedlls/*.exe16
+%{_libdir}/wine/fakedlls/*.mod16
+%{_libdir}/wine/fakedlls/*.ocx
+%{_libdir}/wine/fakedlls/*.sys
+%{_libdir}/wine/fakedlls/*.tlb
+%{_libdir}/wine/fakedlls/*.vxd
 %{_mandir}/man1/wine.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
@@ -439,7 +466,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
@@ -452,11 +478,13 @@ fi
 %{_libdir}/wine/libwinecrt0.a
 %{_includedir}/wine
 %{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.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
@@ -465,7 +493,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