diff --git a/.gitignore b/.gitignore index 8ce9770..a4d789e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kgpg-15.08.1.tar.xz +/kgpg-15.08.2.tar.xz diff --git a/kgpg-15.08.1-autostart.patch b/kgpg-15.08.1-autostart.patch deleted file mode 100644 index eaa6f5c..0000000 --- a/kgpg-15.08.1-autostart.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up kgpg-15.08.1/CMakeLists.txt.autostart kgpg-15.08.1/CMakeLists.txt -diff -up kgpg-15.08.1/kgpg.desktop.autostart kgpg-15.08.1/kgpg.desktop ---- kgpg-15.08.1/kgpg.desktop.autostart 2015-08-11 13:18:31.000000000 -0500 -+++ kgpg-15.08.1/kgpg.desktop 2015-10-02 08:03:11.802658696 -0500 -@@ -218,3 +218,4 @@ X-KDE-autostart-after=panel - X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false - - Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; -+OnlyShowIn=KDE; diff --git a/kgpg-15.08.2-autostart.patch b/kgpg-15.08.2-autostart.patch new file mode 100644 index 0000000..684c735 --- /dev/null +++ b/kgpg-15.08.2-autostart.patch @@ -0,0 +1,12 @@ +diff -up kgpg-15.08.2/kgpg.desktop.autostart kgpg-15.08.2/kgpg.desktop +--- kgpg-15.08.2/kgpg.desktop.autostart 2015-09-22 02:15:10.000000000 -0500 ++++ kgpg-15.08.2/kgpg.desktop 2015-11-06 10:18:49.453307376 -0600 +@@ -215,6 +215,7 @@ Name[zh_CN]=KGpg + Name[zh_TW]=KGpg + + X-KDE-autostart-after=panel +-X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false ++X-KDE-autostart-condition[$e]=$(kde4-config --type config --locate kgpgrc):User Interface:AutoStart:false + + Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; ++OnlyShowIn=KDE; diff --git a/kgpg.spec b/kgpg.spec index 9eb6667..e90dcb3 100644 --- a/kgpg.spec +++ b/kgpg.spec @@ -1,7 +1,7 @@ Name: kgpg Summary: Manage GPG encryption keys -Version: 15.08.1 +Version: 15.08.2 Release: 1%{?dist} License: GPLv2+ @@ -17,8 +17,8 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% ## upstreamable patches # add support for gpg2 to kgpg Patch50: kgpg-4.8.80-gpg2.patch -# add OnlyShowIn=KDE; , FIXME: move to /etc/xdg/autostart too, currently implemented inline below -Patch51: kgpg-15.08.1-autostart.patch +# add OnlyShowIn=KDE; hack to support X-KDE-Autostart-condition on plasma5 +Patch51: kgpg-15.08.2-autostart.patch BuildRequires: desktop-file-utils BuildRequires: kdelibs4-devel >= 4.14 @@ -100,6 +100,9 @@ fi %changelog +* Fri Nov 06 2015 Rex Dieter 15.08.2-1 +- 15.08.2, improved autostart.patch + * Fri Oct 02 2015 Rex Dieter - 15.08.1-1 - 15.08.1 - fix autostart, update URL, use %%license diff --git a/sources b/sources index 19ff68a..98afaa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a54958dd3a55f4cdfb5ba08a8dd7977 kgpg-15.08.1.tar.xz +35920c4fa291a74b1bef5f2ba1cfbdbb kgpg-15.08.2.tar.xz