Hello community,

here is the log from the commit of package kwallet for openSUSE:Factory checked 
in at 2016-11-17 12:37:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwallet (Old)
 and      /work/SRC/openSUSE:Factory/.kwallet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kwallet"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes  2016-10-28 
12:24:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes     2016-11-17 
12:37:40.000000000 +0100
@@ -1,0 +2,9 @@
+Sat Nov  5 22:11:57 UTC 2016 - [email protected]
+
+- Update to 5.28.0
+  * If Gpgmepp is not found, try to use KF5Gpgmepp
+  * Use Gpgmepp from GpgME-1.7.0
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.28.0.php
+
+-------------------------------------------------------------------

Old:
----
  kwallet-5.27.0.tar.xz

New:
----
  kwallet-5.28.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kwallet.spec ++++++
--- /var/tmp/diff_new_pack.2lo2xE/_old  2016-11-17 12:37:41.000000000 +0100
+++ /var/tmp/diff_new_pack.2lo2xE/_new  2016-11-17 12:37:41.000000000 +0100
@@ -18,17 +18,22 @@
 
 %bcond_without lang
 %define lname   libKF5Wallet5
-%define _tar_path 5.27
+%define _tar_path 5.28
 Name:           kwallet
-Version:        5.27.0
+Version:        5.28.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= %{_tar_path}
 BuildRequires:  fdupes
 %if 0%{?is_opensuse}
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libqgpgme-devel
+%else
 BuildRequires:  gpgmepp5-devel
 %endif
+%endif
+BuildRequires:  boost-devel
 BuildRequires:  kconfig-devel >= %{_tar_path}
 BuildRequires:  kconfigwidgets-devel >= %{_tar_path}
 BuildRequires:  kcoreaddons-devel >= %{_tar_path}

++++++ kwallet-5.27.0.tar.xz -> kwallet-5.28.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/CMakeLists.txt 
new/kwallet-5.28.0/CMakeLists.txt
--- old/kwallet-5.27.0/CMakeLists.txt   2016-10-02 12:00:59.000000000 +0200
+++ new/kwallet-5.28.0/CMakeLists.txt   2016-11-05 15:59:12.000000000 +0100
@@ -4,7 +4,7 @@
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 
 include(FeatureSummary)
-find_package(ECM 5.27.0  NO_MODULE)
+find_package(ECM 5.28.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake 
Modules." URL 
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND 
FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
@@ -14,8 +14,8 @@
 set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
 
-set(KF5_VERSION "5.27.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.27.0") # handled by release scripts
+set(KF5_VERSION "5.28.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.28.0") # handled by release scripts
 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kwallet-5.27.0/po/de/docs/kwallet-query/man-kwallet-query.1.docbook 
new/kwallet-5.28.0/po/de/docs/kwallet-query/man-kwallet-query.1.docbook
--- old/kwallet-5.27.0/po/de/docs/kwallet-query/man-kwallet-query.1.docbook     
2016-10-02 12:00:59.000000000 +0200
+++ new/kwallet-5.28.0/po/de/docs/kwallet-query/man-kwallet-query.1.docbook     
2016-11-05 15:59:12.000000000 +0100
@@ -61,7 +61,7 @@
     <simpara
 >kwallet-query kann dazu verwendet werden, wenn Shell-Skripte den 
 >KDE-Passwortspeicher lesen oder aktualisieren. Dazu werden die Einträge im 
 >Programm <emphasis role="strong"
 >KDE-Passwortspeicher</emphasis
->. Der einzige Parameter ist der Name des <emphasis
+> geändert. Der einzige Parameter ist der Name des <emphasis
 >Passwortspeichers</emphasis
 >, der gelesen oder aktualisiert werden soll. Der Operationsmodus wird durch 
 >die angegebenen Optionen bestimmt.</simpara>
   </refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/po/fi/kwalletd5.po 
new/kwallet-5.28.0/po/fi/kwalletd5.po
--- old/kwallet-5.27.0/po/fi/kwalletd5.po       2016-10-02 12:00:59.000000000 
+0200
+++ new/kwallet-5.28.0/po/fi/kwalletd5.po       2016-11-05 15:59:12.000000000 
+0100
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the kdebase package.
 # Tommi Nieminen <[email protected]>, 2009, 2010, 2011.
 # Jorma Karvonen <[email protected]>, 2010.
-# Lasse Liehu <[email protected]>, 2011, 2013, 2014, 2015.
+# Lasse Liehu <[email protected]>, 2011, 2013, 2014, 2015, 2016.
 #
 # KDE Finnish translation sprint participants:
 # Author: Lliehu
@@ -12,7 +12,7 @@
 "Project-Id-Version: kwalletd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n";
 "POT-Creation-Date: 2016-09-26 07:01+0000\n"
-"PO-Revision-Date: 2015-02-05 16:47+0200\n"
+"PO-Revision-Date: 2016-10-15 23:10+0200\n"
 "Last-Translator: Lasse Liehu <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
 "Language: fi\n"
@@ -21,7 +21,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2012-12-01 22:22:15+0000\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -222,10 +222,6 @@
 "järjestelmän asennus ja yritä uudelleen."
 
 #: knewwalletdialog.cpp:156
-#, fuzzy
-#| msgid ""
-#| "Seems that your system has no keys suitable for encryption. Please set-up "
-#| "at least an encryption key, then try again."
 msgid ""
 "Seems that your system has no keys suitable for encryption. Please set-up at "
 "least one encryption key, then try again."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/po/ko/kwalletd5.po 
new/kwallet-5.28.0/po/ko/kwalletd5.po
--- old/kwallet-5.27.0/po/ko/kwalletd5.po       2016-10-02 12:00:59.000000000 
+0200
+++ new/kwallet-5.28.0/po/ko/kwalletd5.po       2016-11-05 15:59:12.000000000 
+0100
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Shinjo Park <[email protected]>, 2008, 2009, 2014, 2015.
+# Shinjo Park <[email protected]>, 2008, 2009, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kwalletd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n";
 "POT-Creation-Date: 2016-09-26 07:01+0000\n"
-"PO-Revision-Date: 2015-04-26 17:26+0200\n"
+"PO-Revision-Date: 2016-10-20 23:20+0100\n"
 "Last-Translator: Shinjo Park <[email protected]>\n"
 "Language-Team: Korean <[email protected]>\n"
 "Language: ko\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -214,16 +214,12 @@
 "태를 확인한 다음 다시 시도하십시오."
 
 #: knewwalletdialog.cpp:156
-#, fuzzy
-#| msgid ""
-#| "Seems that your system has no keys suitable for encryption. Please set-up "
-#| "at least an encryption key, then try again."
 msgid ""
 "Seems that your system has no keys suitable for encryption. Please set-up at "
 "least one encryption key, then try again."
 msgstr ""
-"시스템에 암호화용 키가 없는 것 같습니다. 암호화 키를 설정한 다음 다시 시도하"
-"십시오."
+"시스템에 암호화용 키가 없는 것 같습니다. 하나 이상의 암호화 키를 설정한 다음 "
+"다시 시도하십시오."
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: knewwalletdialoggpg.ui:17
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/po/nb/kwalletd5.po 
new/kwallet-5.28.0/po/nb/kwalletd5.po
--- old/kwallet-5.27.0/po/nb/kwalletd5.po       2016-10-02 12:00:59.000000000 
+0200
+++ new/kwallet-5.28.0/po/nb/kwalletd5.po       2016-11-05 15:59:12.000000000 
+0100
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: kwalletd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2016-08-12 07:15+0000\n"
+"POT-Creation-Date: 2016-09-26 07:01+0000\n"
 "PO-Revision-Date: 2015-04-27 19:45+0200\n"
 "Last-Translator: Bjørn Steensrud <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -212,8 +212,8 @@
 "passord for denne lommeboka eller trykk Avbryt for å avslå programmets "
 "forespørsel.</qt>"
 
-#: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162
-#: kwalletwizard.cpp:166
+#: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:163
+#: kwalletwizard.cpp:167
 msgid ""
 "The QGpgME library failed to initialize for the OpenPGP protocol. Please "
 "check your system's configuration then try again."
@@ -444,19 +444,19 @@
 "Det har vært gjort flere mislykte forsøk på å få tilgang til en lommebok. "
 "Det kan være et program som ikke oppfører seg pent."
 
-#: kwalletwizard.cpp:52
+#: kwalletwizard.cpp:53
 msgid "KWallet"
 msgstr "KWallet"
 
-#: kwalletwizard.cpp:281
+#: kwalletwizard.cpp:282
 msgid "<qt>Password is empty.  <b>(WARNING: Insecure)</b></qt>"
 msgstr "<qt>Mangler passord.  <b>(VARSEL: Usikkert)</b></qt>"
 
-#: kwalletwizard.cpp:283
+#: kwalletwizard.cpp:284
 msgid "Passwords match."
 msgstr "Passordene stemmer."
 
-#: kwalletwizard.cpp:286
+#: kwalletwizard.cpp:287
 msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/po/nn/kwalletd5.po 
new/kwallet-5.28.0/po/nn/kwalletd5.po
--- old/kwallet-5.27.0/po/nn/kwalletd5.po       2016-10-02 12:00:59.000000000 
+0200
+++ new/kwallet-5.28.0/po/nn/kwalletd5.po       2016-11-05 15:59:12.000000000 
+0100
@@ -1,13 +1,13 @@
 # Translation of kwalletd5 to Norwegian Nynorsk
 #
 # Eirik U. Birkeland <[email protected]>, 2009, 2010.
-# Karl Ove Hufthammer <[email protected]>, 2015.
+# Karl Ove Hufthammer <[email protected]>, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE 4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2016-08-12 07:15+0000\n"
-"PO-Revision-Date: 2015-08-28 20:21+0100\n"
+"POT-Creation-Date: 2016-09-26 07:01+0000\n"
+"PO-Revision-Date: 2016-10-15 09:05+0100\n"
 "Last-Translator: Karl Ove Hufthammer <[email protected]>\n"
 "Language-Team: Norwegian Nynorsk <[email protected]>\n"
 "Language: nn\n"
@@ -211,8 +211,8 @@
 "Oppgje eit passord for denne lommeboka, eller trykk «Avbryt» for å nekta "
 "programmet tilgang.</qt>"
 
-#: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162
-#: kwalletwizard.cpp:166
+#: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:163
+#: kwalletwizard.cpp:167
 msgid ""
 "The QGpgME library failed to initialize for the OpenPGP protocol. Please "
 "check your system's configuration then try again."
@@ -225,6 +225,8 @@
 "Seems that your system has no keys suitable for encryption. Please set-up at "
 "least one encryption key, then try again."
 msgstr ""
+"Det ser ut til at systemet ditt ikkje har nokon nøklar som kan brukast til "
+"kryptering. Lag minst éin krypteringsnøkkel, og prøv så på nytt."
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: knewwalletdialoggpg.ui:17
@@ -442,19 +444,19 @@
 "Det er gjort fleire mislukka forsøk på å få tilgang til ei lommebok. Det kan "
 "vera at eit program ikkje oppfører seg skikkeleg."
 
-#: kwalletwizard.cpp:52
+#: kwalletwizard.cpp:53
 msgid "KWallet"
 msgstr "KWallet"
 
-#: kwalletwizard.cpp:281
+#: kwalletwizard.cpp:282
 msgid "<qt>Password is empty.  <b>(WARNING: Insecure)</b></qt>"
 msgstr "<qt>Passordet er tomt.  <b>(ÅTVARING: Usikkert)</b></qt>"
 
-#: kwalletwizard.cpp:283
+#: kwalletwizard.cpp:284
 msgid "Passwords match."
 msgstr "Passorda er like."
 
-#: kwalletwizard.cpp:286
+#: kwalletwizard.cpp:287
 msgid "Passwords do not match."
 msgstr "Passorda er ikkje like."
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/po/zh_CN/kwalletd5.po 
new/kwallet-5.28.0/po/zh_CN/kwalletd5.po
--- old/kwallet-5.27.0/po/zh_CN/kwalletd5.po    2016-10-02 12:00:59.000000000 
+0200
+++ new/kwallet-5.28.0/po/zh_CN/kwalletd5.po    2016-11-05 15:59:12.000000000 
+0100
@@ -10,9 +10,9 @@
 "Project-Id-Version: kwalletd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n";
 "POT-Creation-Date: 2016-09-26 07:01+0000\n"
-"PO-Revision-Date: 2016-02-19 12:10-0800\n"
+"PO-Revision-Date: 2016-10-09 20:39-0800\n"
 "Last-Translator: Weng Xuetian <[email protected]>\n"
-"Language-Team: Chinese <[email protected]>\n"
+"Language-Team: Chinese <[email protected]>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -211,10 +211,6 @@
 msgstr "QGpgME 库初始化 OpenPGP 协议失败。请检查您的系统配置并重试。"
 
 #: knewwalletdialog.cpp:156
-#, fuzzy
-#| msgid ""
-#| "Seems that your system has no keys suitable for encryption. Please set-up "
-#| "at least an encryption key, then try again."
 msgid ""
 "Seems that your system has no keys suitable for encryption. Please set-up at "
 "least one encryption key, then try again."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/src/runtime/kwalletd/CMakeLists.txt 
new/kwallet-5.28.0/src/runtime/kwalletd/CMakeLists.txt
--- old/kwallet-5.27.0/src/runtime/kwalletd/CMakeLists.txt      2016-10-02 
12:00:59.000000000 +0200
+++ new/kwallet-5.28.0/src/runtime/kwalletd/CMakeLists.txt      2016-11-05 
15:59:12.000000000 +0100
@@ -13,16 +13,22 @@
 find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
 
 ########### find needed packages ######
-find_package(Gpgme)  # Called by KF5Gpgmepp, but since we call some gpgme
-                     # functions ourselves we need to link against it directly.
-find_package(KF5Gpgmepp) # provided by kdepimlibs
+find_package(Gpgmepp) # provided by GpgME
+set(GPGMEPP_LIBS Gpgmepp)
 
-if (KF5Gpgmepp_FOUND)
+if (NOT Gpgmepp_FOUND)
+    find_package(Gpgme)  # Called by KF5Gpgmepp, but since we call some gpgme
+                         # functions ourselves we need to link against it 
directly.
+    find_package(KF5Gpgmepp) # provided by KF5Gpgmepp
+    set(GPGMEPP_LIBS KF5::Gpgmepp)
+endif(NOT Gpgmepp_FOUND)
+
+if (Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
     message("GPG support enabled")
     add_definitions(-DHAVE_QGPGME)
     add_definitions(-DBOOST_NO_EXCEPTIONS)
     include_directories(${GPGME_INCLUDES})
-endif(KF5Gpgmepp_FOUND)
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 
 ########### build backends #########
@@ -67,7 +73,7 @@
    migrationwizard2.ui
 )
 
-if (KF5Gpgmepp_FOUND)
+if (Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
     set(kwalletd_SRCS
         ${kwalletd_SRCS}
         knewwalletdialog.cpp
@@ -78,7 +84,7 @@
         knewwalletdialogintro.ui
         knewwalletdialoggpg.ui
     )
-endif(KF5Gpgmepp_FOUND)
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 find_file(kwallet_xml org.kde.KWallet.xml HINTS 
${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet)
 
@@ -112,10 +118,10 @@
     KF5::WidgetsAddons
     KF5::WindowSystem
     KF5::Notifications)
-if (KF5Gpgmepp_FOUND)
-    target_link_libraries(kwalletd5 KF5::Gpgmepp )
+if (Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
+    target_link_libraries(kwalletd5 ${GPGMEPP_LIBS})
     kde_target_enable_exceptions(kwalletd5 PRIVATE)
-endif(KF5Gpgmepp_FOUND)
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 install(TARGETS kwalletd5  ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kwallet-5.27.0/src/runtime/kwalletd/backend/CMakeLists.txt 
new/kwallet-5.28.0/src/runtime/kwalletd/backend/CMakeLists.txt
--- old/kwallet-5.27.0/src/runtime/kwalletd/backend/CMakeLists.txt      
2016-10-02 12:00:59.000000000 +0200
+++ new/kwallet-5.28.0/src/runtime/kwalletd/backend/CMakeLists.txt      
2016-11-05 15:59:12.000000000 +0100
@@ -5,10 +5,10 @@
 
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(sys/bitypes.h HAVE_SYS_BITYPES_H)
-if (KF5Gpgmepp_FOUND)
+if (Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
     add_definitions(-DHAVE_QGPGME)
     add_definitions(-DBOOST_NO_EXCEPTIONS)
-endif(KF5Gpgmepp_FOUND)
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 configure_file (config-kwalletbackend.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-kwalletbackend.h )
 
@@ -48,9 +48,9 @@
 ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWALLETBACKEND SOVERSION 5)
 
 target_link_libraries(kwalletbackend5 Qt5::Widgets KF5::WidgetsAddons 
KF5::CoreAddons KF5::Notifications KF5::I18n ${LIBGCRYPT_LIBRARIES})
-if(KF5Gpgmepp_FOUND)
-target_link_libraries(kwalletbackend5 KF5::Gpgmepp)
-endif(KF5Gpgmepp_FOUND)
+if(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
+   target_link_libraries(kwalletbackend5 ${GPGMEPP_LIBS})
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 # link with advapi32 on windows
 if(WIN32 AND NOT WINCE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kwallet-5.27.0/tests/kwalletd/CMakeLists.txt 
new/kwallet-5.28.0/tests/kwalletd/CMakeLists.txt
--- old/kwallet-5.27.0/tests/kwalletd/CMakeLists.txt    2016-10-02 
12:00:59.000000000 +0200
+++ new/kwallet-5.28.0/tests/kwalletd/CMakeLists.txt    2016-11-05 
15:59:12.000000000 +0100
@@ -11,7 +11,13 @@
 find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
-find_package(KF5Gpgmepp) # provided by kdepimlibs
+find_package(Gpgmepp) # provided by GpgME
+set(GPGMEPP_LIBS Gpgmepp)
+
+if (NOT Gpgmepp_FOUND)
+    find_package(KF5Gpgmepp) # provided by KF5Gpgmepp
+    set(GPGMEPP_LIBS KF5::Gpgmepp)
+endif(NOT Gpgmepp_FOUND)
 
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
@@ -29,10 +35,10 @@
    ../../src/runtime/kwalletd/kwalletwizardpagegpgkey.ui
 )
 
-if (KF5Gpgmepp_FOUND)
+if (Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
     qt5_wrap_ui(kwalletwizardtest_SRCS
         ../../src/runtime/kwalletd/kwalletwizardpagepasswordgpg.ui)
-endif(KF5Gpgmepp_FOUND)
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 add_executable(kwalletwizardtest ${kwalletwizardtest_SRCS})
 ecm_mark_as_test(kwalletwizardtest)
@@ -43,9 +49,9 @@
     KF5::I18n
     KF5::IconThemes
     KF5::WidgetsAddons)
-if (KF5Gpgmepp_FOUND)
-    target_link_libraries(kwalletwizardtest KF5::Gpgmepp)
-endif(KF5Gpgmepp_FOUND)
+if (Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
+    target_link_libraries(kwalletwizardtest ${GPGMEPP_LIBS})
+endif(Gpgmepp_FOUND OR KF5Gpgmepp_FOUND)
 
 set(kwallettestlib_SRCS kwallettest.cpp)
 add_library(kwallettestlib STATIC ${kwallettestlib_SRCS})


Reply via email to