Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2015-12-29 12:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgpg (Old) and /work/SRC/openSUSE:Factory/.kgpg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kgpg" Changes: -------- --- /work/SRC/openSUSE:Factory/kgpg/kgpg.changes 2015-11-15 12:35:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2015-12-29 12:58:23.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Dec 17 10:13:41 UTC 2015 - [email protected] + +- Install properly the ServiceMenus on plasma5 bnc#959490 + +------------------------------------------------------------------- +Sun Dec 13 13:19:12 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- kgpg-15.08.3.tar.xz New: ---- kgpg-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.5vTGAn/_old 2015-12-29 12:58:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5vTGAn/_new 2015-12-29 12:58:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: kgpg -Version: 15.08.3 +Version: 15.12.0 Release: 0 Summary: Encryption Tool License: GPL-2.0+ @@ -25,14 +25,15 @@ Url: http://www.kde.org Source0: kgpg-%{version}.tar.xz Patch1: kgpg-autostart.diff +BuildRequires: kf5-filesystem BuildRequires: libgpgme-devel BuildRequires: libkdepimlibs4-devel BuildRequires: xz Requires: gpg2 Recommends: kdepim4-runtime BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires -%kde4_pimlibs_requires +%{kde4_runtime_requires} +%{kde4_pimlibs_requires} %description Kgpg is a simple GUI for gpg @@ -48,6 +49,13 @@ %install %kde4_makeinstall -C build %suse_update_desktop_file kgpg Utility Security +# for 13.15+ symlink the servicemenus for plasma5/kf5 too +%if 0%{?suse_version} > 1310 +mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus +pushd %{buildroot}%{_kde4_servicesdir}/ServiceMenus/ > /dev/null +ln -s *.desktop %{buildroot}/%{_kf5_servicesdir}/ServiceMenus/ +popd > /dev/null +%endif %kde_post_install %post -p /sbin/ldconfig @@ -67,5 +75,7 @@ %{_kde4_datadir}/dbus-1/interfaces/*.xml %{_kde4_iconsdir}/hicolor/*/*/*.png %{_kde4_servicesdir}/ServiceMenus/*.desktop +%dir %{_kf5_servicesdir}/ServiceMenus/ +%{_kf5_servicesdir}/ServiceMenus/*.desktop %changelog ++++++ kgpg-15.08.3.tar.xz -> kgpg-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.3/CMakeLists.txt new/kgpg-15.12.0/CMakeLists.txt --- old/kgpg-15.08.3/CMakeLists.txt 2015-11-05 17:13:45.000000000 +0100 +++ new/kgpg-15.12.0/CMakeLists.txt 2015-12-08 06:49:44.000000000 +0100 @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) + project(kgpg) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.3/caff.cpp new/kgpg-15.12.0/caff.cpp --- old/kgpg-15.08.3/caff.cpp 2015-11-05 17:13:45.000000000 +0100 +++ new/kgpg-15.12.0/caff.cpp 2015-12-08 06:49:44.000000000 +0100 @@ -67,6 +67,8 @@ void KGpgCaffPrivate::reexportKey(const KGpgSignableNode *key) { + Q_Q(KGpgCaff); + Q_ASSERT(m_tempdir.isNull()); // find out if the given id can be used for encryption @@ -90,7 +92,11 @@ /* see http://lists.gnupg.org/pipermail/gnupg-devel/2014-December/029296.html */ QFile seclink(m_secringdir); - seclink.link(m_tempdir->name() + QLatin1String("private-keys-v1.d")); + if (!seclink.link(m_tempdir->name() + QLatin1String("private-keys-v1.d"))) { + KMessageBox::sorry(qobject_cast<QWidget *>(q->parent()), + i18n("This function is not available on this system. The symbolic link to the private GnuPG keys cannot be created.")); + return; + } } // export all keys necessary for signing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.08.3/main.cpp new/kgpg-15.12.0/main.cpp --- old/kgpg-15.08.3/main.cpp 2015-11-05 17:13:45.000000000 +0100 +++ new/kgpg-15.12.0/main.cpp 2015-12-08 06:49:44.000000000 +0100 @@ -23,7 +23,7 @@ static const char description[] = I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy it."); -static const char version[] = "2.16.1"; +static const char version[] = "2.17.0"; int main(int argc, char *argv[]) {
