diff --git a/0003-Updated-desktop-file-for-the-new-format.patch b/0003-Updated-desktop-file-for-the-new-format.patch index 760c5a5..6e349d4 100644 --- a/0003-Updated-desktop-file-for-the-new-format.patch +++ b/0003-Updated-desktop-file-for-the-new-format.patch @@ -1,4 +1,4 @@ -From 40ca9ee5ca7a3f3f2a1c36f862cbeb9696a860b8 Mon Sep 17 00:00:00 2001 +From 102fbfd31dd26c911e0b5313e3e36ded8a3d390a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kone=C4=8Dn=C3=BD?= Date: Thu, 12 Nov 2015 19:32:48 +0100 @@ -7,11 +7,11 @@ Subject: [PATCH] Updated desktop file for the new format Now it pass without warning or error through desktop-file-validate tester. --- - etc/PlayOnLinux.desktop | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + etc/PlayOnLinux.desktop | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/etc/PlayOnLinux.desktop b/etc/PlayOnLinux.desktop -index 08b1d23..f619154 100644 +index 08b1d23..76b5bfa 100644 --- a/etc/PlayOnLinux.desktop +++ b/etc/PlayOnLinux.desktop @@ -1,9 +1,8 @@ @@ -21,12 +21,13 @@ index 08b1d23..f619154 100644 Name=PlayOnLinux -Comment=PlayOnLinux -Type=Application %F +-Exec=playonlinux +Comment=Front-end application for the wine +Type=Application - Exec=playonlinux ++Exec=playonlinux %F Icon=/usr/share/playonlinux/etc/playonlinux.png -Categories=Application;Game -+Categories=Utility;GTK; ++Categories=Utility;Emulator; -- -2.4.3 +2.7.4 diff --git a/0007-Install-lang-files-correctly.patch b/0007-Install-lang-files-correctly.patch index cfc814b..2644f54 100644 --- a/0007-Install-lang-files-correctly.patch +++ b/0007-Install-lang-files-correctly.patch @@ -1,4 +1,4 @@ -From 7edafce9c4dc19e3c323b73e62681001234ead81 Mon Sep 17 00:00:00 2001 +From d7a33c3043b2590694b843ca6405ffe8c0f50dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kone=C4=8Dn=C3=BD?= Date: Fri, 22 Jan 2016 21:03:39 +0100 @@ -10,7 +10,7 @@ To use installed locales DEBIAN_PACKAGE value must be set to true. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index a4fca7d..511f344 100644 +index a24755a..2242fa6 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,8 @@ build: @@ -22,15 +22,15 @@ index a4fca7d..511f344 100644 install: install -d $(bindir) -@@ -61,6 +63,7 @@ install: - install -d $(sharedir)/applications +@@ -62,6 +64,7 @@ install: + install -d $(sharedir)/appdata install -d $(sharedir)/playonlinux/bin install -d $(sharedir)/man/man1 + install -d $(sharedir)/locale $(GZIP) -c ./doc/playonlinux-pkg.1 > $(sharedir)/man/man1/playonlinux-pkg.1.gz $(GZIP) -c ./doc/playonlinux.1 > $(sharedir)/man/man1/playonlinux.1.gz cp ./etc/PlayOnLinux.desktop $(sharedir)/applications/PlayOnLinux.desktop -@@ -70,7 +73,8 @@ install: +@@ -72,7 +75,8 @@ install: cp ./bin/{playonlinux,playonlinux-pkg} $(bindir)/ cp ./bin/playonlinux-check_dd $(execdir)/ cp ./{playonlinux*,README.md,TRANSLATORS,CHANGELOG.md,LICENCE} $(sharedir)/playonlinux/ @@ -41,5 +41,5 @@ index a4fca7d..511f344 100644 changelog: (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) -- -2.5.0 +2.7.4 diff --git a/0008-Fix-bad-icon-path-in-Desktop-file.patch b/0008-Fix-bad-icon-path-in-Desktop-file.patch index d27b6b4..c8a0b5c 100644 --- a/0008-Fix-bad-icon-path-in-Desktop-file.patch +++ b/0008-Fix-bad-icon-path-in-Desktop-file.patch @@ -1,4 +1,4 @@ -From 75f43c3eadde99fc56fffbae860ba37ceaf14c02 Mon Sep 17 00:00:00 2001 +From afc8ea4ba7be9f7ef466b47a50b8a9d611601a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Kone=C4=8Dn=C3=BD?= Date: Wed, 9 Mar 2016 19:00:25 +0100 @@ -9,16 +9,16 @@ Subject: [PATCH] Fix bad icon path in Desktop file 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/PlayOnLinux.desktop b/etc/PlayOnLinux.desktop -index f619154..97dcf8a 100644 +index 76b5bfa..c3c5ee3 100644 --- a/etc/PlayOnLinux.desktop +++ b/etc/PlayOnLinux.desktop @@ -4,5 +4,5 @@ Name=PlayOnLinux Comment=Front-end application for the wine Type=Application - Exec=playonlinux + Exec=playonlinux %F -Icon=/usr/share/playonlinux/etc/playonlinux.png +Icon=/usr/share/pixmaps/playonlinux.png - Categories=Utility;GTK; + Categories=Utility;Emulator; -- -2.5.0 +2.7.4 diff --git a/0009-Update-PlayOnLinux.appdata.xml-to-new-format.patch b/0009-Update-PlayOnLinux.appdata.xml-to-new-format.patch new file mode 100644 index 0000000..3e7f869 --- /dev/null +++ b/0009-Update-PlayOnLinux.appdata.xml-to-new-format.patch @@ -0,0 +1,39 @@ +From 94cfdcdee9c2d1e6537350f3c154d0e7929c537a Mon Sep 17 00:00:00 2001 +From: Jiri Konecny +Date: Sat, 3 Sep 2016 09:50:24 +0200 +Subject: [PATCH] Update PlayOnLinux.appdata.xml to new format + +Add bugtracker link. +Add how to donate donation link. +Add where to find help link. +Add translation tutorial link. +Add keywords for search. +--- + etc/PlayOnLinux.appdata.xml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/etc/PlayOnLinux.appdata.xml b/etc/PlayOnLinux.appdata.xml +index 4b3f62f..4d6d784 100644 +--- a/etc/PlayOnLinux.appdata.xml ++++ b/etc/PlayOnLinux.appdata.xml +@@ -34,5 +34,17 @@ + + + https://www.playonlinux.com/ ++ https://www.playonlinux.com/en/bugs.html ++ https://www.playonlinux.com/en/donate.html ++ http://wiki.playonlinux.com/index.php/Main_Page ++ http://wiki.playonlinux.com/index.php/Scripting_-_Chapter_10:_Script_Translation ++ ++ ++ wine ++ games ++ software ++ windows ++ ++ + dragonlichcz_at_gmail.com + +-- +2.7.4 + diff --git a/playonlinux.spec b/playonlinux.spec index db79608..15e936d 100644 --- a/playonlinux.spec +++ b/playonlinux.spec @@ -3,7 +3,7 @@ Version: 4.2.10 Summary: Graphical front-end for Wine License: GPLv3 URL: https://www.playonlinux.com -Release: 7%{?dist} +Release: 8%{?dist} Requires: unzip Requires: wine Requires: wget @@ -47,6 +47,9 @@ Patch6: 0007-Install-lang-files-correctly.patch # Fix bad path in desktop file # https://github.com/PlayOnLinux/POL-POM-4/pull/40 Patch7: 0008-Fix-bad-icon-path-in-Desktop-file.patch +# Update AppData.xml with new values +# https://github.com/PlayOnLinux/POL-POM-4/pull/41 +Patch8: 0009-Update-PlayOnLinux.appdata.xml-to-new-format.patch %global BUILD_DIR %{buildroot}/%{_datadir}/%{name} @@ -88,6 +91,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/PlayOnLin %{_libexecdir}/playonlinux-check_dd %changelog +* Sat Sep 3 2016 Jiri Konecny - 4.2.10-8 +- Add new patch for the updated appdata.xml file +- Improve old Patch2 for desktop file +- Rebase Patch6 and Patch7 on top of Patch2 + * Wed Mar 9 2016 Jiri Konecny - 4.2.10-7 - Apply patch which fixing bad icon path in a desktop file