X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wine.spec;h=4583239cd7e64abec066986ea33bdf054f5249ea;hb=7265d9f2dc584fe4eaf2fa21d8ffcb923a2b1a4f;hp=d2158981f13f77d506a21244972adfc362e99f1d;hpb=5c36538d141a8f11a9cd7a1e06df7189fd21dd08;p=packages%2Fwine.git

diff --git a/wine.spec b/wine.spec
index d215898..4583239 100644
--- a/wine.spec
+++ b/wine.spec
@@ -4,10 +4,9 @@
 %bcond_without	arts		# don't build aRts mm driver
 %bcond_without	jack		# don't build JACK mm driver
 %bcond_without	nas		# don't build NAS mm driver
+%bcond_with	d3d9		# build with d3d9 patch
 %bcond_without	sane		# don't build TWAIN DLL with scanning support (through SANE)
 %bcond_without	cups		# without CUPS printing support in winspool,wineps DLLs
-%bcond_without	html_docs	# build html docs
-%bcond_without	pdf_docs	# build pdf docs
 %bcond_with	xlibs
 #
 # NOTE: wine detects the following SONAMES for dlopen at build time:
@@ -30,22 +29,23 @@ Summary(es):	Ejecuta programas Windows en Linux
 Summary(pl):	Program pozwalaj±cy uruchamiaæ aplikacje Windows
 Summary(pt_BR):	Executa programas Windows no Linux
 Name:		wine
-Version:	20040615
-Release:	0.1
+Version:	0.9.2
+Release:	1
+Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 #Source0:	http://dl.sourceforge.net/%{name}/Wine-%{version}.tar.gz
-Source0:	ftp://ftp.ibiblio.org/pub/Linux/ALPHA/%{name}/development/Wine-%{version}.tar.gz
-# Source0-md5:	5cfec5a33b596a08eefd2f8a44ccd205
+#Source0:	ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-%{version}.tar.gz
+Source0:	http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2
+# Source0-md5:	cda71fc261e415250ea01f2016d1db24
 Source1:	%{name}.init
-Source2:	%{name}.reg
-Source3:	%{name}.systemreg
-Source4:	%{name}.userreg
 Patch0:		%{name}-fontcache.patch
 Patch1:		%{name}-destdir.patch
-Patch2:		%{name}-ncurses.patch
-Patch3:		%{name}-makedep.patch
-#Patch4:		%{name}-dga.patch
+Patch2:		%{name}-makedep.patch
+Patch3:		%{name}-alsa.patch
+# Oliver Stieber's DirectX 9 support patch (unofficial, published on WWN Issue #271)
+Patch4:		%{name}-d3d9patch.patch
+#PatchX:		%{name}-dga.patch
 URL:		http://www.winehq.org/
 %if %{with xlibs}
 BuildRequires:	libSM-devel
@@ -69,6 +69,7 @@ BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-utils
 BuildRequires:	flex
 BuildRequires:	fontconfig-devel
+BuildRequires:	fontforge
 BuildRequires:	freetype-devel >= 2.0.5
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	libjpeg-devel
@@ -76,20 +77,10 @@ BuildRequires:	libtool
 BuildRequires:	libungif-devel
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	ncurses-devel
-%if %{with html_docs} || %{with pdf_docs}
 # db2* failed previously - probably openjade or opensp bug
 BuildRequires:	openjade >= 1:1.3.3-0.pre1
 BuildRequires:	opensp >= 1:1.5.1
-%endif
 BuildRequires:	openssl-devel >= 0.9.7d
-%if %{with pdf_docs}
-BuildRequires:	tetex-latex-cyrillic
-BuildRequires:	tetex-metafont
-BuildRequires:	tetex-fonts-jknappen
-BuildRequires:	tetex-fonts-pazo
-BuildRequires:	tetex-fonts-stmaryrd
-BuildRequires:	tetex-fonts-type1-urw
-%endif
 %{?with_sane:BuildRequires:	sane-backends-devel}
 BuildRequires:	xrender-devel
 Requires(post):	/sbin/ldconfig
@@ -119,11 +110,11 @@ Ejecuta programas Windows en Linux.
 
 %description -l pl
 Wine jest programem dziêki któremu mo¿na uruchamiaæ programy napisane
-dla Microsoft Windows pod systemami unixowymi. Sk³ada siê on z
+dla Microsoft Windows pod systemami uniksowymi. Sk³ada siê on z
 loadera, który pozwala wczytywaæ i uruchamiaæ programy w formacie
 Microsoft Windows, oraz z biblioteki, która implementuje API Windows
-przy u¿yciu odpowiedników Unixowych oraz z X11. Biblioteka mo¿e byæ
-tak¿e wykorzystana do przenoszenia aplikacji Win32 do Unixa.
+przy u¿yciu odpowiedników uniksowych oraz z X11. Biblioteka mo¿e byæ
+tak¿e wykorzystana do przenoszenia aplikacji Win32 do Uniksa.
 
 %description -l pt_BR
 O Wine é um programa que permite rodar programas MS-Windows no X11.
@@ -137,7 +128,7 @@ Summary(es):	Biblioteca de desarrollo de wine
 Summary(pl):	Wine - pliki nag³owkowe
 Summary(pt_BR):	Biblioteca de desenvolvimento do wine
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Wine - header files.
@@ -156,7 +147,7 @@ WINE.
 Summary:	Wine - programs
 Summary(pl):	Wine - programy
 Group:		Applications
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description programs
 Wine - programs.
@@ -164,22 +155,11 @@ Wine - programs.
 %description programs -l pl
 Wine - programy.
 
-%package doc-pdf
-Summary:	Wine documentation in PDF
-Summary(pl):	Dokumentacja Wine w formacie PDF
-Group:		Documentation
-
-%description doc-pdf
-Wine documentation in PDF format.
-
-%description doc-pdf -l pl
-Dokumentacja Wine w formacie PDF.
-
 %package dll-d3d
 Summary:	Direct3D implementation DLLs for Wine
 Summary(pl):	Biblioteki DLL z implementacj± Direct3D dla Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	OpenGL
 
 %description dll-d3d
@@ -192,7 +172,7 @@ Biblioteki DLL z implementacj
 Summary:	OpenGL implementation DLLs for Wine
 Summary(pl):	Biblioteki DLL z implementacj± OpenGL dla Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	OpenGL
 
 %description dll-gl
@@ -205,7 +185,7 @@ Biblioteki DLL z implementacj
 Summary:	TWAIN implementation DLL for Wine
 Summary(pl):	Biblioteka DLL z implementacj± TWAIN dla Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description dll-twain
 TWAIN implementation DLL for Wine (through SANE).
@@ -217,7 +197,7 @@ Biblioteka DLL z implementacj
 Summary:	ALSA driver for WINE mm.dll implementation
 Summary(pl):	Sterownik ALSA dla implementacji mm.dll w Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description drv-alsa
 ALSA driver for WINE mm.dll (multimedia system) implementation.
@@ -229,7 +209,7 @@ Sterownik ALSA dla implementacji mm.dll (systemu multimedi
 Summary:	aRts driver for WINE mm.dll implementation
 Summary(pl):	Sterownik aRts dla implementacji mm.dll w Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description drv-arts
 aRts driver for WINE mm.dll (multimedia system) implementation.
@@ -239,9 +219,9 @@ Sterownik aRts dla implementacji mm.dll (systemu multimedi
 
 %package drv-jack
 Summary:	JACK driver for WINE mm.dll implementation
-Summary(pl):	Sterownik JACK dla implementacji mm.dll w Wine
+Summary(pl):	Sterownik JACK-a dla implementacji mm.dll w Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+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}}
@@ -250,13 +230,14 @@ Requires:	jack-audio-connection-kit
 JACK driver for WINE mm.dll (multimedia system) implementation.
 
 %description drv-jack -l pl
-Sterownik JACK dla implementacji mm.dll (systemu multimediów) w Wine.
+Sterownik JACK-a dla implementacji mm.dll (systemu multimediów) w
+Wine.
 
 %package drv-nas
 Summary:	NAS driver for WINE mm.dll implementation
 Summary(pl):	Sterownik NAS dla implementacji mm.dll w Wine
 Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description drv-nas
 NAS driver for WINE mm.dll (multimedia system) implementation.
@@ -270,16 +251,13 @@ Sterownik NAS dla implementacji mm.dll (systemu multimedi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%%patch4 -p1
+%{?with_d3d9:%patch4 -p1}
 
 # turn off compilation of some tools
-#sed -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in > .tmp
-sed -e "s|avitools||" programs/Makefile.in > .tmp
-mv -f .tmp programs/Makefile.in
+sed -i -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in
+#sed -i -e "s|avitools||" programs/Makefile.in
 
 %build
-%{__libtoolize}
-%{__aclocal}
 %{__autoconf}
 %configure \
 	%{!?debug:--disable-debug} \
@@ -292,22 +270,6 @@ mv -f .tmp programs/Makefile.in
 %{__make} -C programs
 #%{__make} -C programs/regapi
 
-cd documentation
-%if %{with html_docs}
-db2html wine-user.sgml
-db2html wine-devel.sgml
-db2html wine-faq.sgml
-db2html winelib-user.sgml
-%endif
-
-%if %{with pdf_docs}
-db2pdf wine-user.sgml
-db2pdf wine-devel.sgml
-db2pdf wine-faq.sgml
-db2pdf winelib-user.sgml
-%endif
-cd -
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
@@ -318,7 +280,6 @@ install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
 %{__make} -C programs install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install programs/winhelp/hlp2sgml	$RPM_BUILD_ROOT%{_bindir}
 install tools/fnt2bdf			$RPM_BUILD_ROOT%{_bindir}
 
 install aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
@@ -332,9 +293,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d \
 	$RPM_BUILD_ROOT%{_winedir}/{"Program Files/Common Files","My Documents"}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wine
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
 
 touch $RPM_BUILD_ROOT%{_winedir}/{autoexec.bat,config.sys,windows/win.ini}
 touch $RPM_BUILD_ROOT%{_winedir}/windows/system/{shell.dll,shell32.dll}
@@ -376,10 +334,10 @@ rm -f files.programs;	touch 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|twain_32.dll.so|winealsa.drv.so|winearts.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|twain.dll.so|twain_32.dll.so|winealsa.drv.so|winearts.drv.so|winejack.drv.so|winenas.drv.so)
+			;;
+		*)
+			echo "%attr(755,root,root) %{_libdir}/wine/$f" >>$BZZZ/files.so
 	esac
 done
 cd -
@@ -413,15 +371,17 @@ fi
 %files -f files.so
 %defattr(644,root,root,755)
 %doc README DEVELOPERS-HINTS ChangeLog BUGS AUTHORS ANNOUNCE
-%doc documentation/samples
-%if %{with html_docs}
-%doc documentation/wine-{faq,user}
-%endif
+%lang(de) %doc documentation/README.de
+%lang(es) %doc documentation/README.es
+%lang(fr) %doc documentation/README.fr
+%lang(it) %doc documentation/README.it
+%lang(pt) %doc documentation/README.pt
+%lang(pt_BR) %doc documentation/README.pt_br
+%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}/wineclipsrv
 %attr(755,root,root) %{_bindir}/winedbg
 %attr(755,root,root) %{_bindir}/wine-kthread
 %attr(755,root,root) %{_bindir}/winelauncher
@@ -433,24 +393,20 @@ fi
 %attr(755,root,root) %{_libdir}/*.so*
 %dir %{_libdir}/wine
 %{_mandir}/man1/wine.*
-%{_mandir}/man5/wine.conf.*
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wine.reg
-%config(missingok,noreplace) %verify(not size mtime md5) %{_sysconfdir}/wine.systemreg
-%config(missingok,noreplace) %verify(not size mtime md5) %{_sysconfdir}/wine.userreg
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/wine
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineserver.*
+%attr(754,root,root) /etc/rc.d/init.d/wine
 %{_winedir}
+%{_datadir}/fonts/wine
+%{_desktopdir}/wine.desktop
 
 %files programs -f files.programs
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)
-%if %{with html_docs}
-%doc documentation/{wine-devel,winelib-user}
-%endif
 %attr(755,root,root) %{_bindir}/fnt2bdf
 %attr(755,root,root) %{_bindir}/function_grep.pl
-%attr(755,root,root) %{_bindir}/hlp2sgml
 %attr(755,root,root) %{_bindir}/widl
 %attr(755,root,root) %{_bindir}/winebuild
 %attr(755,root,root) %{_bindir}/winedump
@@ -460,21 +416,23 @@ fi
 #%attr(755,root,root) %{_bindir}/winewrap
 %attr(755,root,root) %{_bindir}/wmc
 %attr(755,root,root) %{_bindir}/wrc
+%{_libdir}/wine/lib*.def
+# no shared variants, so not separated
+%{_libdir}/wine/lib*.def.a
+%{_libdir}/wine/libdx*.a
+%{_libdir}/wine/libstrmiids.a
+%{_libdir}/wine/libuuid.a
+%{_libdir}/wine/libwinecrt0.a
 %{_includedir}/wine
 %{_mandir}/man1/widl.1*
 %{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
 %{_mandir}/man1/winemaker.1*
 %{_mandir}/man1/winebuild.1*
 %{_mandir}/man1/wmc.1*
 %{_mandir}/man1/wrc.1*
 %{_aclocaldir}/*.m4
 
-%if %{with pdf_docs}
-%files doc-pdf
-%defattr(644,root,root,755)
-%doc documentation/*.pdf
-%endif
-
 %files dll-d3d
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/wine/d3d8.dll.so
@@ -490,7 +448,7 @@ fi
 %if %{with sane}
 %files dll-twain
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/wine/twain_32.dll.so
+%attr(755,root,root) %{_libdir}/wine/twain*.dll.so
 %endif
 
 %if %{with alsa}