- add uninstaller desktop entry; rel 2

Changed files:
    wine.spec -> 1.314

diff --git a/wine.spec b/wine.spec
index aaaf97a513b2252fc7ddb7446dae4e42aaead4ef..20b1d0559eee8f21abd39f4bb0a7c451b918812b 100644 (file)
--- a/wine.spec
+++ b/wine.spec
@@ -31,18 +31,19 @@ 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.61
-Release:       1
+Release:       2
 Epoch:         1
 License:       LGPL
 Group:         Applications/Emulators
 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
 Patch4:                %{name}-disable-valgrind.patch
-#PatchX:               %{name}-dga.patch
+#PatchX:       %{name}-dga.patch
 URL:           http://www.winehq.org/
 BuildRequires: OpenGL-GLU-devel
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
@@ -257,7 +258,6 @@ sed -i -e "s|winetest \\\|\\\|;s|avitools||" programs/Makefile.in
 %{__make} depend
 %{__make}
 %{__make} -C programs
-#%{__make} -C programs/regapi
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -272,7 +272,6 @@ install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
 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} \
@@ -285,7 +284,7 @@ touch $RPM_BUILD_ROOT%{_winedir}/{autoexec.bat,config.sys,windows/win.ini}
 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
@@ -335,6 +334,10 @@ for p in $programs; do
        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
 
@@ -383,6 +386,8 @@ fi
 %{_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)