Hello community, here is the log from the commit of package kconfig for openSUSE:Factory checked in at 2017-06-01 16:27:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfig (Old) and /work/SRC/openSUSE:Factory/.kconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfig" Thu Jun 1 16:27:34 2017 rev:43 rq:499762 version:5.34.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kconfig/kconfig.changes 2017-04-30 21:17:50.679909326 +0200 +++ /work/SRC/openSUSE:Factory/.kconfig.new/kconfig.changes 2017-06-01 16:27:36.902434923 +0200 @@ -1,0 +2,17 @@ +Tue May 30 13:05:29 UTC 2017 - [email protected] + +- Adjust license as pointed out during legal review + +------------------------------------------------------------------- +Mon May 15 13:53:16 CEST 2017 - [email protected] + +- Update to 5.34.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.34.0.php +- Changes since 5.33.0: + * Fix relativePath calculation in KDesktopFile::locateLocal() (kde#345100) +- Remove patches, now upstreaM: + * fix-locateLocal.patch + +------------------------------------------------------------------- Old: ---- fix-locateLocal.patch kconfig-5.33.0.tar.xz New: ---- kconfig-5.34.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfig.spec ++++++ --- /var/tmp/diff_new_pack.YNBMS6/_old 2017-06-01 16:27:37.410363303 +0200 +++ /var/tmp/diff_new_pack.YNBMS6/_new 2017-06-01 16:27:37.410363303 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.33 +%define _tar_path 5.34 Name: kconfig -Version: 5.33.0 +Version: 5.34.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -33,15 +33,13 @@ BuildRequires: cmake(Qt5Gui) >= 5.6.0 BuildRequires: cmake(Qt5Xml) >= 5.6.0 Summary: Provides an advanced configuration system -License: LGPL-2.1+ +License: LGPL-2.1+ and GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf # PATCH-FEATURE-OPENSUSE Patch: kconfig-desktop-translations.patch -# PATCH-FIX-UPSTREAM -Patch1: fix-locateLocal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -126,7 +124,6 @@ %prep %setup -q %patch -p1 -%patch1 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ kconfig-5.33.0.tar.xz -> kconfig-5.34.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.33.0/CMakeLists.txt new/kconfig-5.34.0/CMakeLists.txt --- old/kconfig-5.33.0/CMakeLists.txt 2017-04-01 21:29:57.000000000 +0200 +++ new/kconfig-5.34.0/CMakeLists.txt 2017-05-06 11:29:40.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.33.0") # handled by release scripts +set(KF5_VERSION "5.34.0") # handled by release scripts project(KConfig VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.33.0 NO_MODULE) +find_package(ECM 5.34.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.33.0/autotests/kdesktopfiletest.cpp new/kconfig-5.34.0/autotests/kdesktopfiletest.cpp --- old/kconfig-5.33.0/autotests/kdesktopfiletest.cpp 2017-04-01 21:29:57.000000000 +0200 +++ new/kconfig-5.34.0/autotests/kdesktopfiletest.cpp 2017-05-06 11:29:40.000000000 +0200 @@ -255,3 +255,34 @@ QVERIFY(!desktopFile.tryExec()); } } + +void KDesktopFileTest::testLocateLocal_data() +{ + QString systemConfigLocation = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last(); + QString writableConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); + QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last(); + QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + + QTest::addColumn<QString>("path"); + QTest::addColumn<QString>("result"); + + QTest::newRow("configLocation, system-wide") << systemConfigLocation + "/test.desktop" << writableConfigLocation + "/test.desktop"; + QTest::newRow("autostart, system-wide") << systemConfigLocation + "/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop"; + QTest::newRow("dataLocation, system-wide") << systemDataLocation + "/test.desktop" << writableDataLocation + "/test.desktop"; + QTest::newRow("applications, system-wide") << systemDataLocation + "/applications/test.desktop" << writableDataLocation + "/applications/test.desktop"; + QTest::newRow("desktop-directories, system-wide") << systemDataLocation + "/desktop-directories/test.directory" << writableDataLocation + "/desktop-directories/test.directory"; + QTest::newRow("configLocation, writable") << writableConfigLocation + "/test.desktop" << writableConfigLocation + "/test.desktop"; + QTest::newRow("autostart, writable") << writableConfigLocation + "/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop"; + QTest::newRow("dataLocation, writable") << writableDataLocation + "/test.desktop" << writableDataLocation + "/test.desktop"; + QTest::newRow("applications, writable") << writableDataLocation + "/applications/test.desktop" << writableDataLocation + "/applications/test.desktop"; + QTest::newRow("desktop-directories, writable") << writableDataLocation + "/desktop-directories/test.directory" << writableDataLocation + "/desktop-directories/test.directory"; + QTest::newRow("unknown location") << "/test.desktop" << writableDataLocation + "/test.desktop"; +} + +void KDesktopFileTest::testLocateLocal() +{ + QFETCH(QString, path); + QFETCH(QString, result); + + QCOMPARE(KDesktopFile::locateLocal(path), result); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.33.0/autotests/kdesktopfiletest.h new/kconfig-5.34.0/autotests/kdesktopfiletest.h --- old/kconfig-5.33.0/autotests/kdesktopfiletest.h 2017-04-01 21:29:57.000000000 +0200 +++ new/kconfig-5.34.0/autotests/kdesktopfiletest.h 2017-05-06 11:29:40.000000000 +0200 @@ -34,6 +34,8 @@ void testActionGroup(); void testIsAuthorizedDesktopFile(); void testTryExecWithAuthorizeAction(); + void testLocateLocal_data(); + void testLocateLocal(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.33.0/po/bg/kconfig5_qt.po new/kconfig-5.34.0/po/bg/kconfig5_qt.po --- old/kconfig-5.33.0/po/bg/kconfig5_qt.po 2017-04-01 21:29:57.000000000 +0200 +++ new/kconfig-5.34.0/po/bg/kconfig5_qt.po 2017-05-06 11:29:40.000000000 +0200 @@ -1,8 +1,5 @@ -# translation of kwriteconfig.po to Bulgarian -# Bulgarian translation of KDE. -# This file is licensed under the GPL. -# -# $Id: kconfig5_qt.po 1482726 2017-02-15 04:58:07Z scripty $ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. # # Zlatko Popov <[email protected]>, 2007, 2008. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-5.33.0/src/core/kdesktopfile.cpp new/kconfig-5.34.0/src/core/kdesktopfile.cpp --- old/kconfig-5.33.0/src/core/kdesktopfile.cpp 2017-04-01 21:29:57.000000000 +0200 +++ new/kconfig-5.34.0/src/core/kdesktopfile.cpp 2017-05-06 11:29:40.000000000 +0200 @@ -83,14 +83,14 @@ // Relative to config? (e.g. for autostart) Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) { if (path.startsWith(dir + plus)) { - relativePath = dir.mid(path.length() + 1); + relativePath = path.mid(dir.length() + 1); return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + relativePath; } } // Relative to xdg data dir? (much more common) Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) { if (path.startsWith(dir + plus)) { - relativePath = dir.mid(path.length() + 1); + relativePath = path.mid(dir.length() + 1); } } if (relativePath.isEmpty()) {
