Author: glen Date: Tue Dec 21 23:31:36 2010 GMT Module: packages Tag: HEAD ---- Log message: - install icon properly (not create dir by icon name) - misc cosmetics
---- Files affected: packages/wine: wine.spec (1.393 -> 1.394) ---- Diffs: ================================================================ Index: packages/wine/wine.spec diff -u packages/wine/wine.spec:1.393 packages/wine/wine.spec:1.394 --- packages/wine/wine.spec:1.393 Tue Dec 7 21:40:59 2010 +++ packages/wine/wine.spec Wed Dec 22 00:31:31 2010 @@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8): Executa programas Windows no Linux Name: wine Version: 1.2.2 -Release: 1 +Release: 2 Epoch: 1 License: LGPL Group: Applications/Emulators Source0: http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{version}.tar.bz2 # Source0-md5: e976d64688e0833061e79efa3eac5d2c -Source1: http://downloads.sourceforge.net/wine/wine_gecko-1.0.0-x86.cab +Source1: http://downloads.sourceforge.net/wine/%{name}_gecko-1.0.0-x86.cab # Source1-md5: 9c5c335fc077c0558561afaf25a09e51 Source2: %{name}-uninstaller.desktop Patch0: %{name}-fontcache.patch @@ -69,6 +69,7 @@ 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 @@ -272,6 +273,9 @@ %patch7 -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 \ @@ -319,13 +323,11 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}} - %{__make} 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} \ @@ -366,21 +368,21 @@ # /sbin/chstk -e $RPM_BUILD_ROOT%{_bindir}/wine -programs="notepad regedit regsvr32 wineconsole 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 @@ -390,11 +392,11 @@ done install -d $RPM_BUILD_ROOT%{_winedir}/gecko -install %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko -install -d $RPM_BUILD_ROOT%{_pixmapsdir}/wine.svg -install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} -install programs/winetest/winetest.svg $RPM_BUILD_ROOT%{_pixmapsdir}/wine.svg +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 @@ -460,7 +462,7 @@ %{_winedir} %{_desktopdir}/wine.desktop %{_desktopdir}/wine-uninstaller.desktop -%{_pixmapsdir}/wine.svg +%{_pixmapsdir}/%{name}.png %files programs -f files.programs %defattr(644,root,root,755) @@ -547,6 +549,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.394 2010/12/21 23:31:31 glen +- install icon properly (not create dir by icon name) +- misc cosmetics + Revision 1.393 2010/12/07 20:40:59 adamg - updated to 1.2.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wine/wine.spec?r1=1.393&r2=1.394&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
