Author: glen Date: Mon May 5 15:04:02 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - merge 0.9.61 from HEAD
---- Files affected: SPECS: wine.spec (1.220.2.8.2.22.2.9 -> 1.220.2.8.2.22.2.10) ---- Diffs: ================================================================ Index: SPECS/wine.spec diff -u SPECS/wine.spec:1.220.2.8.2.22.2.9 SPECS/wine.spec:1.220.2.8.2.22.2.10 --- SPECS/wine.spec:1.220.2.8.2.22.2.9 Sun Dec 16 19:16:35 2007 +++ SPECS/wine.spec Mon May 5 17:03:56 2008 @@ -31,18 +31,20 @@ Summary(pl.UTF-8): Program pozwalający uruchamiać aplikacje Windows Summary(pt_BR.UTF-8): Executa programas Windows no Linux Name: wine -Version: 0.9.51 +Version: 0.9.61 Release: 1 Epoch: 1 License: LGPL Group: Applications/Emulators -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2 -# Source0-md5: 1cf4fddfe2432f43f8461a0f064d34c5 +Source0: http://dl.sourceforge.net/wine/%{name}-%{version}.tar.bz2 +# Source0-md5: d01518d529903dca013da592113bd995 +Source1: %{name}-uninstaller.desktop Patch0: %{name}-fontcache.patch Patch1: %{name}-makedep.patch Patch2: %{name}-ncurses.patch Patch3: %{name}-bug9177_workaround.patch -#PatchX: %{name}-dga.patch +Patch4: %{name}-disable-valgrind.patch +#PatchX: %{name}-dga.patch URL: http://www.winehq.org/ BuildRequires: OpenGL-devel BuildRequires: XFree86-devel @@ -67,12 +69,17 @@ BuildRequires: ncurses-devel # db2* failed previously - probably openjade or opensp bug BuildRequires: openjade >= 1:1.3.3-0.pre1 +BuildRequires: openldap-devel BuildRequires: opensp >= 1:1.5.1 BuildRequires: openssl-devel >= 0.9.7d %{?with_sane:BuildRequires: sane-backends-devel} -BuildRequires: valgrind +#BuildRequires: valgrind BuildRequires: xrender-devel Suggests: binfmt-detector +# for winelauncher +Suggests: X11-tools +# for ntlm_auth +Suggests: samba-common >= 1:3.0.25 # link to wine/ntdll.dll.so, without any SONAME Provides: libntdll.dll.so Obsoletes: wine-doc-pdf @@ -88,6 +95,8 @@ %define getsoname() %((objdump -p %{1} 2>/dev/null || echo SONAME ERROR) | awk '/SONAME/ { print $2; s=1 }; END { if(s==0) print "ERROR" }') +%undefine debuginfocflags + %description Wine is a program which allows running Microsoft Windows programs (including DOS, Windows 3.x and Win32 executables) on Unix. It @@ -230,6 +239,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # turn off compilation of some tools sed -i -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in @@ -244,14 +254,9 @@ --enable-curses \ --enable-opengl \ --with-x - -# $ORIGIN does not work in our builders -export LD_LIBRARY_PATH=$(pwd)/libs/wine - %{__make} depend %{__make} %{__make} -C programs -#%{__make} -C programs/regapi %install rm -rf $RPM_BUILD_ROOT @@ -266,7 +271,6 @@ install tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir} install aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4 -#mv -f $RPM_BUILD_ROOT{/usr/X11R6/share/aclocal,%{_aclocaldir}}/wine.m4 install -d \ $RPM_BUILD_ROOT%{_winedir}/windows/{system,Desktop,Favorites,Fonts} \ @@ -279,7 +283,7 @@ touch $RPM_BUILD_ROOT%{_winedir}/windows/system/{shell.dll,shell32.dll} touch $RPM_BUILD_ROOT%{_winedir}/windows/system/{winsock.dll,wsock32.dll} -cat >$RPM_BUILD_ROOT%{_winedir}/windows/system.ini <<EOF +cat > $RPM_BUILD_ROOT%{_winedir}/windows/system.ini <<'EOF' [mci] cdaudio=mcicda.drv sequencer=mciseq.drv @@ -329,6 +333,10 @@ 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 + %clean rm -rf $RPM_BUILD_ROOT @@ -359,7 +367,7 @@ %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}/winelauncher %attr(755,root,root) %{_bindir}/wineprefixcreate %attr(755,root,root) %{_bindir}/wine-preloader %attr(755,root,root) %{_bindir}/wine-pthread @@ -370,12 +378,15 @@ %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.drv16 %{_libdir}/wine/*.exe16 +%{_libdir}/wine/*.mod16 %{_mandir}/man1/wine.1* %{_mandir}/man1/winedbg.1* %{_mandir}/man1/wineprefixcreate.1* %{_mandir}/man1/wineserver.1* %{_winedir} %{_desktopdir}/wine.desktop +%{_desktopdir}/wine-uninstaller.desktop +%{_pixmapsdir}/wine.svg %files programs -f files.programs %defattr(644,root,root,755) @@ -390,12 +401,14 @@ %attr(755,root,root) %{_bindir}/wineg++ %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 # no shared variants, so not separated %{_libdir}/wine/lib*.def.a +%{_libdir}/wine/libadsiid.a %{_libdir}/wine/libdx*.a %{_libdir}/wine/libstrmiids.a %{_libdir}/wine/libuuid.a @@ -403,8 +416,8 @@ %{_includedir}/wine %{_mandir}/man1/widl.1* %{_mandir}/man1/winedump.1* -%{_mandir}/man1/wineg++.1* %{_mandir}/man1/winegcc.1* +%{_mandir}/man1/wineg++.1* %{_mandir}/man1/winemaker.1* %{_mandir}/man1/winebuild.1* %{_mandir}/man1/wmc.1* @@ -459,6 +472,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.220.2.8.2.22.2.10 2008-05-05 15:03:56 glen +- merge 0.9.61 from HEAD + Revision 1.220.2.8.2.22.2.9 2007-12-16 18:16:35 adamg - updated to 0.9.51 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wine.spec?r1=1.220.2.8.2.22.2.9&r2=1.220.2.8.2.22.2.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
