From 89855d12226a04e2464556399ba8a236911b18bd068c5a0afd833203284a8270 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 14 Jun 2010 14:33:34 +0000 Subject: [PATCH] - Added Ubuntu supplied desktop , menu and icons for Wine stuff. bnc#613850 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=46 --- ubuntuwine.tar.bz2 | 3 +++ wine.changes | 6 ++++++ wine.spec | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 ubuntuwine.tar.bz2 diff --git a/ubuntuwine.tar.bz2 b/ubuntuwine.tar.bz2 new file mode 100644 index 0000000..2b4c539 --- /dev/null +++ b/ubuntuwine.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1ddc082a1d70c43637dc831a5138788f2d9b9d5386201de15ea68d9368e3e1a +size 26182 diff --git a/wine.changes b/wine.changes index 185587a..dbae7aa 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 14 16:23:47 CEST 2010 - meissner@suse.de + +- Added Ubuntu supplied desktop , menu and icons for + Wine stuff. bnc#613850 + ------------------------------------------------------------------- Fri Jun 11 23:04:47 CEST 2010 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 14b8950..43e02f2 100644 --- a/wine.spec +++ b/wine.spec @@ -31,6 +31,7 @@ Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop +Source5: ubuntuwine.tar.bz2 Recommends: wine-gecko wine-mp3 Requires: wine-32bit = %version # for winetricks: @@ -107,12 +108,33 @@ make %{?jobs:-j%jobs} all make install DESTDIR=$RPM_BUILD_ROOT # install desktop file install -d $RPM_BUILD_ROOT/usr/share/applications/ +%suse_update_desktop_file %{SOURCE4} Emulator + install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/ mv $RPM_BUILD_ROOT/%{_mandir}/de.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/de mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr -%suse_update_desktop_file %{SOURCE4} Emulator +tar xjf %{SOURCE5} +# Copied from Ubuntu Wine out of debian.diff +# https://launchpad.net/~ubuntu-wine/+archive/ppa/+packages +# taken on 1.2rc2 time. +cd ubuntuwine + install -d $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + install -c -m 644 wine.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged + + # Install application-specific desktop files + install -d $RPM_BUILD_ROOT/usr/share/applications + install -c -m 644 *.desktop $RPM_BUILD_ROOT/usr/share/applications/ + + install -d $RPM_BUILD_ROOT/usr/share/desktop-directories/ + install -c -m 644 *.directory $RPM_BUILD_ROOT/usr/share/desktop-directories/ + + # Install icons + install -d $RPM_BUILD_ROOT/usr/share/pixmaps + install -c -m 644 *.svg $RPM_BUILD_ROOT/usr/share/pixmaps +cd .. + %fdupes -s $RPM_BUILD_ROOT %clean @@ -160,6 +182,16 @@ rm -rf $RPM_BUILD_ROOT /usr/share/wine /usr/share/applications/wine.desktop %doc %{_mandir}/*/* +%dir /etc/xdg/ +%dir /etc/xdg/menus/ +%dir /etc/xdg/menus/applications-merged +/etc/xdg/menus/applications-merged/*.menu +%dir /usr/share/applications +/usr/share/applications/*.desktop +%dir /usr/share/desktop-directories/ +/usr/share/desktop-directories/*.directory +%dir /usr/share/pixmaps +/usr/share/pixmaps/*.svg %ifarch %ix86