commit kompare for openSUSE:Factory
Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2017-01-25 23:00:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kompare" Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2016-12-17 10:46:23.347910932 +0100 +++ /work/SRC/openSUSE:Factory/.kompare.new/kompare.changes 2017-01-25 23:00:30.481466052 +0100 @@ -1,0 +2,7 @@ +Sat Jan 14 08:59:51 UTC 2017 - lbeltrame@kde.org + +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php + +------------------------------------------------------------------- Old: ---- kompare-16.12.0.tar.xz New: ---- kompare-16.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.HsffhK/_old 2017-01-25 23:00:31.185359638 +0100 +++ /var/tmp/diff_new_pack.HsffhK/_new 2017-01-25 23:00:31.193358428 +0100 @@ -17,10 +17,10 @@ Name: kompare -Version: 16.12.0 +Version: 16.12.1 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: File Comparator License: GPL-2.0 and GFDL-1.2 ++++++ kompare-16.12.0.tar.xz -> kompare-16.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-16.12.0/CMakeLists.txt new/kompare-16.12.1/CMakeLists.txt --- old/kompare-16.12.0/CMakeLists.txt 2016-07-07 21:40:19.000000000 +0200 +++ new/kompare-16.12.1/CMakeLists.txt 2016-12-13 22:22:58.000000000 +0100 @@ -10,7 +10,7 @@ include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(GenerateExportHeader) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-16.12.0/komparepart/kompare_part.cpp new/kompare-16.12.1/komparepart/kompare_part.cpp --- old/kompare-16.12.0/komparepart/kompare_part.cpp 2016-07-07 21:40:19.000000000 +0200 +++ new/kompare-16.12.1/komparepart/kompare_part.cpp 2016-12-13 22:22:58.000000000 +0100 @@ -39,6 +39,7 @@ #include <ksharedconfig.h> #include <kstandardaction.h> #include <kstandardshortcut.h> +#include <kstandardguiitem.h> #include <kio/copyjob.h> #include <kio/statjob.h> @@ -564,7 +565,7 @@ i18n("Patch Files (*.diff *.dif *.patch)") ); if ( QFile::exists( url.toLocalFile() ) ) { - int result = KMessageBox::warningYesNoCancel( widget(), i18n("The file exists or is write-protected; do you want to overwrite it?"), i18n("File Exists"), KGuiItem(i18n("Overwrite")), KGuiItem(i18n("Do Not Overwrite")) ); + int result = KMessageBox::warningYesNoCancel( widget(), i18n("The file exists or is write-protected; do you want to overwrite it?"), i18n("File Exists"), KStandardGuiItem::overwrite(), KGuiItem(i18n("Do Not Overwrite")) ); if ( result == KMessageBox::Cancel ) { break;
participants (1)
-
root@hilbertn.suse.de