From 56ce225ece659c85b69a10d113da0b3e0622c298b8e38dd575f897e0893702a8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 12 Jan 2016 16:24:44 +0000 Subject: [PATCH 1/4] Accepting request 353274 from home:MargueriteSu:branches:Emulators OBS-URL: https://build.opensuse.org/request/show/353274 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=336 --- wine.changes | 10 ++++++++++ wine.spec | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/wine.changes b/wine.changes index e948999..475b012 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 12 16:08:11 UTC 2016 - i@marguerite.su + +- make sure wine desktop files installed under correct categories + * currently they land in "unspecific category" + * "Emulator" can only be used after "System" or "Game" according + to freedesktop specification + * "Wine" itself is not a valid category + * "Documentation" doesn't fit wine related stuff + ------------------------------------------------------------------- Sat Jan 9 10:22:46 UTC 2016 - meissner@suse.com diff --git a/wine.spec b/wine.spec index df057f9..b670d81 100644 --- a/wine.spec +++ b/wine.spec @@ -166,7 +166,7 @@ make %{?_smp_mflags} all make install DESTDIR=%{buildroot} # install desktop file install -d %{buildroot}%{_datadir}/applications/ -%suse_update_desktop_file %{SOURCE4} Emulator +%suse_update_desktop_file %{SOURCE4} Utility install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/ install -m 0644 %SOURCE6 %{buildroot}%{_datadir}/applications/ @@ -194,6 +194,16 @@ cd ubuntuwine install -d %{buildroot}%{_datadir}/desktop-directories/ install -c -m 644 *.directory %{buildroot}%{_datadir}/desktop-directories/ + # Correct desktop files' categories + for i in browsedrive msi notepad regedit winehelp do + %suse_update_desktop_file wine-${i} -r Utility + done + %suse_update_desktop_file wine-notepad TextEditor + %suse_update_desktop_file wine-uninstaller -r Settings + %suse_update_desktop_file wine-cfg -r Settings + %suse_update_desktop_file wine-winefile -r System FileManager + %suse_update_desktop_file wine-winemine -r Game BoardGame + # Install icons install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -c -m 644 *.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ From 89099f2fd51456e466e9ed15687706b1771138aae2e4b48dc8eebbd48bdbc9c3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 19 Jan 2016 08:14:00 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=337 --- wine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine.spec b/wine.spec index b670d81..4117eac 100644 --- a/wine.spec +++ b/wine.spec @@ -195,7 +195,7 @@ cd ubuntuwine install -c -m 644 *.directory %{buildroot}%{_datadir}/desktop-directories/ # Correct desktop files' categories - for i in browsedrive msi notepad regedit winehelp do + for i in browsedrive msi notepad regedit winehelp; do %suse_update_desktop_file wine-${i} -r Utility done %suse_update_desktop_file wine-notepad TextEditor From 95654d5d6237ba27e04b166300da90bce6eef3e11fb253cfe3ede26f5c50f934 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 19 Jan 2016 10:31:33 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=338 --- wine.changes | 10 ---------- wine.spec | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/wine.changes b/wine.changes index 475b012..e948999 100644 --- a/wine.changes +++ b/wine.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 12 16:08:11 UTC 2016 - i@marguerite.su - -- make sure wine desktop files installed under correct categories - * currently they land in "unspecific category" - * "Emulator" can only be used after "System" or "Game" according - to freedesktop specification - * "Wine" itself is not a valid category - * "Documentation" doesn't fit wine related stuff - ------------------------------------------------------------------- Sat Jan 9 10:22:46 UTC 2016 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 4117eac..df057f9 100644 --- a/wine.spec +++ b/wine.spec @@ -166,7 +166,7 @@ make %{?_smp_mflags} all make install DESTDIR=%{buildroot} # install desktop file install -d %{buildroot}%{_datadir}/applications/ -%suse_update_desktop_file %{SOURCE4} Utility +%suse_update_desktop_file %{SOURCE4} Emulator install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/ install -m 0644 %SOURCE6 %{buildroot}%{_datadir}/applications/ @@ -194,16 +194,6 @@ cd ubuntuwine install -d %{buildroot}%{_datadir}/desktop-directories/ install -c -m 644 *.directory %{buildroot}%{_datadir}/desktop-directories/ - # Correct desktop files' categories - for i in browsedrive msi notepad regedit winehelp; do - %suse_update_desktop_file wine-${i} -r Utility - done - %suse_update_desktop_file wine-notepad TextEditor - %suse_update_desktop_file wine-uninstaller -r Settings - %suse_update_desktop_file wine-cfg -r Settings - %suse_update_desktop_file wine-winefile -r System FileManager - %suse_update_desktop_file wine-winemine -r Game BoardGame - # Install icons install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -c -m 644 *.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ From 70bad6e45f6d21d0c32fd9e3983da85de9987fb8594569c86a3b529ed698e6f9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 20 Jan 2016 13:37:38 +0000 Subject: [PATCH 4/4] Accepting request 354939 from home:MargueriteSu:branches:Emulators fix for previous commit is here OBS-URL: https://build.opensuse.org/request/show/354939 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=339 --- wine.changes | 10 ++++++++++ wine.spec | 14 +++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/wine.changes b/wine.changes index e948999..475b012 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 12 16:08:11 UTC 2016 - i@marguerite.su + +- make sure wine desktop files installed under correct categories + * currently they land in "unspecific category" + * "Emulator" can only be used after "System" or "Game" according + to freedesktop specification + * "Wine" itself is not a valid category + * "Documentation" doesn't fit wine related stuff + ------------------------------------------------------------------- Sat Jan 9 10:22:46 UTC 2016 - meissner@suse.com diff --git a/wine.spec b/wine.spec index df057f9..fb951cb 100644 --- a/wine.spec +++ b/wine.spec @@ -166,7 +166,7 @@ make %{?_smp_mflags} all make install DESTDIR=%{buildroot} # install desktop file install -d %{buildroot}%{_datadir}/applications/ -%suse_update_desktop_file %{SOURCE4} Emulator +%suse_update_desktop_file %{SOURCE4} System Emulator install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/ install -m 0644 %SOURCE6 %{buildroot}%{_datadir}/applications/ @@ -190,10 +190,22 @@ cd ubuntuwine # Install application-specific desktop files install -d %{buildroot}%{_datadir}/applications install -c -m 644 *.desktop %{buildroot}%{_datadir}/applications/ + sed -i "/X-SuSE-translate/d" %{buildroot}%{_datadir}/applications/*.desktop install -d %{buildroot}%{_datadir}/desktop-directories/ install -c -m 644 *.directory %{buildroot}%{_datadir}/desktop-directories/ + # Correct desktop files' categories + %suse_update_desktop_file -n -r wine-notepad Utility TextEditor + %suse_update_desktop_file -n -r wine-uninstaller System Emulator + %suse_update_desktop_file -n -r wine-winecfg System Emulator + %suse_update_desktop_file -n -r wine-regedit System Emulator + %suse_update_desktop_file -n -r wine-winehelp System Emulator + %suse_update_desktop_file -n -r wine-msi System Emulator + %suse_update_desktop_file -n -r wine-browsedrive System Emulator + %suse_update_desktop_file -n -r wine-winefile System FileManager + %suse_update_desktop_file -n -r wine-winemine Game BoardGame + # Install icons install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -c -m 644 *.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/