Hello community, here is the log from the commit of package kjots for openSUSE:Factory checked in at 2016-05-20 11:55:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjots (Old) and /work/SRC/openSUSE:Factory/.kjots.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjots" Changes: -------- --- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2016-02-22 10:12:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-05-20 11:55:45.000000000 +0200 @@ -1,0 +2,14 @@ +Thu May 12 13:15:47 UTC 2016 - [email protected] + +- Fix name of appdata.xml file and content to be aligned with the + .desktop file that has been renamed. +- Add a comment to the .desktop file. + +------------------------------------------------------------------- +Sun Feb 14 09:00:49 UTC 2016 - [email protected] + +- Add patch fix-desktop-file.patch to make the installed + desktop file work again. Thanks to Christian Trippe to + detect the error. + +------------------------------------------------------------------- New: ---- fix-desktop-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjots.spec ++++++ --- /var/tmp/diff_new_pack.UtqqoJ/_old 2016-05-20 11:55:46.000000000 +0200 +++ /var/tmp/diff_new_pack.UtqqoJ/_new 2016-05-20 11:55:46.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kjots Version: 5.0.0 Release: 0 @@ -24,23 +25,25 @@ Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz Patch1: make-it-build.diff -BuildRequires: extra-cmake-modules +# PATCH-FIX-UPSTREAM fix-desktop-file.patch -- Make sure that the desktop file is Qt5/Plasma5 compatible +Patch2: fix-desktop-file.patch BuildRequires: boost-devel -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5KIO) +BuildRequires: extra-cmake-modules +BuildRequires: grantlee5-devel +BuildRequires: libxslt-tools +BuildRequires: update-desktop-files +BuildRequires: cmake(KF5Akonadi) +BuildRequires: cmake(KF5AkonadiNotes) +BuildRequires: cmake(KF5Bookmarks) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5Bookmarks) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KF5Akonadi) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5KontactInterface) BuildRequires: cmake(KF5Mime) -BuildRequires: cmake(KF5AkonadiNotes) +BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5PimTextEdit) -BuildRequires: cmake(KF5KontactInterface) -BuildRequires: grantlee5-devel -BuildRequires: libxslt-tools -BuildRequires: update-desktop-files +BuildRequires: cmake(KF5XmlGui) Requires: akonadi_resources Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,6 +56,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build @@ -61,7 +65,14 @@ %install %kf5_makeinstall -C build -%suse_update_desktop_file org.kde.kjots Utility DesktopUtility +%suse_update_desktop_file -C "Note Taker" org.kde.kjots Utility DesktopUtility +# Fixup the .appdata file: it needs to: +# * have the same basename as the .desktop file +# * reference the name of the .desktop file correctly +sed "s|<id>Kjots.desktop</id>|<id>org.kde.kjots.desktop</id>|" \ + %{buildroot}%{_datadir}/appdata/Kjots.appdata.xml > \ + %{buildroot}%{_datadir}/appdata/org.kde.kjots.appdata.xml +rm %{buildroot}%{_datadir}/appdata/Kjots.appdata.xml %find_lang %{name} %post -p /sbin/ldconfig ++++++ fix-desktop-file.patch ++++++ >From d536dbdf606d18baa437d03a9852fa6bb7289953 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 31 Jan 2016 00:09:17 +0100 Subject: Fix Exec in desktop file thx to dvratil for the correct solution. diff --git a/data/org.kde.kjots.desktop b/data/org.kde.kjots.desktop index cd40af1..f7e3533 100755 --- a/data/org.kde.kjots.desktop +++ b/data/org.kde.kjots.desktop @@ -36,7 +36,7 @@ GenericName[uk]=Записна книжка GenericName[x-test]=xxNote Takerxx GenericName[zh_CN]=笔记记录工具 Icon=kjots -Exec=kjots -caption %c +Exec=kjots -qwindowtitle %c Type=Application Terminal=false X-KDE-StartupNotify=true
