Author: arvenil Date: Sat May 5 16:33:07 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - Obsoletes: wine-doc-pdf (merged from HEAD) - aRts sound driver has been removed for good (merged from HEAD) - Obsoletes: wine-drv-arts (merged from HEAD) - up to 0.9.36 (merged from HEAD)
---- Files affected: SPECS: wine.spec (1.220.2.8.2.20 -> 1.220.2.8.2.21) ---- Diffs: ================================================================ Index: SPECS/wine.spec diff -u SPECS/wine.spec:1.220.2.8.2.20 SPECS/wine.spec:1.220.2.8.2.21 --- SPECS/wine.spec:1.220.2.8.2.20 Tue Mar 27 22:44:31 2007 +++ SPECS/wine.spec Sat May 5 18:33:01 2007 @@ -2,7 +2,6 @@ # # Conditional build: %bcond_without alsa # don't build ALSA mm driver -%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_without sane # don't build TWAIN DLL with scanning support (through SANE) @@ -28,13 +27,13 @@ Summary(pl): Program pozwalający uruchamiać aplikacje Windows Summary(pt_BR): Executa programas Windows no Linux Name: wine -Version: 0.9.33 -Release: 2 +Version: 0.9.36 +Release: 1 Epoch: 1 License: LGPL Group: Applications/Emulators Source0: http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2 -# Source0-md5: b2d04c70d17fb36b1a0d98d8e374285d +# Source0-md5: 8cc54b83b5beafcc3d998a04ed723a39 Patch0: %{name}-fontcache.patch Patch1: %{name}-makedep.patch Patch2: %{name}-ncurses.patch @@ -47,7 +46,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bison -# BuildRequires: chpax >= 0.20020901-2 %{?with_cups:BuildRequires: cups-devel} BuildRequires: docbook-dtd31-sgml BuildRequires: docbook-utils @@ -72,6 +70,8 @@ Requires: binfmt-detector # link to wine/ntdll.dll.so, without any SONAME Provides: libntdll.dll.so +Obsoletes: wine-doc-pdf +Obsoletes: wine-drv-arts ExclusiveArch: %{ix86} ExcludeArch: i386 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -191,18 +191,6 @@ %description drv-alsa -l pl Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine. -%package drv-arts -Summary: aRts driver for WINE mm.dll implementation -Summary(pl): Sterownik aRts dla implementacji mm.dll w Wine -Group: Applications/Emulators -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description drv-arts -aRts driver for WINE mm.dll (multimedia system) implementation. - -%description drv-arts -l pl -Sterownik aRts dla implementacji mm.dll (systemu multimediów) w Wine. - %package drv-jack Summary: JACK driver for WINE mm.dll implementation Summary(pl): Sterownik JACK-a dla implementacji mm.dll w Wine @@ -317,7 +305,7 @@ 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|winearts.drv.so|winejack.drv.so|winenas.drv.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" >>$BZZZ/files.so @@ -437,12 +425,6 @@ %attr(755,root,root) %{_libdir}/wine/winealsa.drv.so %endif -%if %{with arts} -%files drv-arts -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/wine/winearts.drv.so -%endif - %if %{with jack} %files drv-jack %defattr(644,root,root,755) @@ -466,6 +448,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.220.2.8.2.21 2007/05/05 16:33:01 arvenil +- Obsoletes: wine-doc-pdf (merged from HEAD) +- aRts sound driver has been removed for good (merged from HEAD) +- Obsoletes: wine-drv-arts (merged from HEAD) +- up to 0.9.36 (merged from HEAD) + Revision 1.220.2.8.2.20 2007/03/27 20:44:31 hawk - ExcludeArch: i386 (while run in i386 wine displays a warning that running on glibc w/o tls will cause most programs to crash, and indeed ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wine.spec?r1=1.220.2.8.2.20&r2=1.220.2.8.2.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
