Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2017-09-19 16:23:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kemoticons" Tue Sep 19 16:23:32 2017 rev:44 rq:526644 version:5.38.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2017-08-24 17:56:03.493500142 +0200 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2017-09-19 16:23:34.689770981 +0200 @@ -1,0 +2,10 @@ +Tue Sep 12 07:11:17 CEST 2017 - lbeltr...@kde.org + +- Update to 5.38.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.38.0.php +- Changes since 5.37.0: + * autotests: fix running tests in parallel, by doing more specific cleanups + +------------------------------------------------------------------- Old: ---- kemoticons-5.37.0.tar.xz New: ---- kemoticons-5.38.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.buV89J/_old 2017-09-19 16:23:36.181559538 +0200 +++ /var/tmp/diff_new_pack.buV89J/_new 2017-09-19 16:23:36.185558971 +0200 @@ -17,18 +17,22 @@ %define lname libKF5Emoticons5 -%define _tar_path 5.37 +%define _tar_path 5.38 +# Full KF5 version (e.g. 5.33.0) +%{!?_kf5_version: %global _kf5_version %{version}} +# Last major and minor KF5 version (e.g. 5.33) +%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kemoticons -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: karchive-devel >= %{_tar_path} -BuildRequires: kconfig-devel >= %{_tar_path} +BuildRequires: karchive-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kservice-devel >= %{_tar_path} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} BuildRequires: cmake(Qt5DBus) >= 5.6.0 BuildRequires: cmake(Qt5Gui) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 @@ -61,8 +65,8 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: karchive-devel >= %{_tar_path} -Requires: kservice-devel >= %{_tar_path} +Requires: karchive-devel >= %{_kf5_bugfix_version} +Requires: kservice-devel >= %{_kf5_bugfix_version} Requires: cmake(Qt5Gui) >= 5.6.0 %description devel ++++++ kemoticons-5.37.0.tar.xz -> kemoticons-5.38.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.37.0/CMakeLists.txt new/kemoticons-5.38.0/CMakeLists.txt --- old/kemoticons-5.37.0/CMakeLists.txt 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/CMakeLists.txt 2017-09-02 23:18:22.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.37.0") # handled by release scripts -set(KF5_DEP_VERSION "5.37.0") # handled by release scripts +set(KF5_VERSION "5.38.0") # handled by release scripts +set(KF5_DEP_VERSION "5.38.0") # handled by release scripts project(KEmoticons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.37.0 NO_MODULE) +find_package(ECM 5.38.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/kemoticons-5.37.0/autotests/kemoticontest.cpp new/kemoticons-5.38.0/autotests/kemoticontest.cpp --- old/kemoticons-5.37.0/autotests/kemoticontest.cpp 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/autotests/kemoticontest.cpp 2017-09-02 23:18:22.000000000 +0200 @@ -48,15 +48,13 @@ void initTestCase() { QStandardPaths::setTestModeEnabled(true); - QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + cleanupTestCase(); + QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); QString destThemePath = dataPath + QLatin1String("/emoticons/"); + QVERIFY(QDir().mkpath(destThemePath)); + const QString destPath = destThemePath + default_theme; QDir themeDir(destThemePath); - if (themeDir.exists()) { - QVERIFY(themeDir.removeRecursively()); - } - QVERIFY(themeDir.mkpath(QStringLiteral("."))); - QVERIFY(copyTheme(QFINDTESTDATA("default-testtheme"), themeDir, default_theme)); // check it can actually be found @@ -65,6 +63,7 @@ QStringLiteral("emoticons/"), QStandardPaths::LocateDirectory); QVERIFY2(!themePath.isEmpty(), qPrintable(themePath)); + QCOMPARE(themePath, destThemePath); // also copy the xmpp theme QVERIFY(copyTheme(QFINDTESTDATA("xmpp-testtheme"), themeDir, QStringLiteral("xmpp-testtheme"))); @@ -74,8 +73,8 @@ { QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); const QString themePath = dataPath + QLatin1String("/emoticons/"); - QDir themeDir(themePath); - QVERIFY(themeDir.removeRecursively()); + QVERIFY(QDir(themePath + default_theme).removeRecursively()); + QVERIFY(QDir(themePath + QStringLiteral("xmpp-testtheme")).removeRecursively()); } void testEmoticonParser_data() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.37.0/autotests/ktexttohtmlplugintest.cpp new/kemoticons-5.38.0/autotests/ktexttohtmlplugintest.cpp --- old/kemoticons-5.37.0/autotests/ktexttohtmlplugintest.cpp 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/autotests/ktexttohtmlplugintest.cpp 2017-09-02 23:18:22.000000000 +0200 @@ -49,15 +49,15 @@ QStandardPaths::setTestModeEnabled(true); QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); QString destThemePath = dataPath + QLatin1String("/emoticons/"); - QDir themeDir(destThemePath); - if (themeDir.exists()) { - QVERIFY(themeDir.removeRecursively()); + QVERIFY(QDir().mkpath(destThemePath)); + mEmoticonsThemePath = destThemePath + "default-testtheme"; + if (QFileInfo::exists(mEmoticonsThemePath)) { + QVERIFY(QDir(mEmoticonsThemePath).removeRecursively()); } - QVERIFY(themeDir.mkpath(QStringLiteral("."))); + QDir themeDir(destThemePath); QVERIFY(copyTheme(QFINDTESTDATA("default-testtheme"), themeDir, "default-testtheme")); KEmoticons::setTheme(QStringLiteral("default-testtheme")); - mEmoticonsThemePath = destThemePath + "default-testtheme"; QVERIFY(!mEmoticonsThemePath.isEmpty()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.37.0/src/providers/adium/CMakeLists.txt new/kemoticons-5.38.0/src/providers/adium/CMakeLists.txt --- old/kemoticons-5.37.0/src/providers/adium/CMakeLists.txt 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/src/providers/adium/CMakeLists.txt 2017-09-02 23:18:22.000000000 +0200 @@ -16,6 +16,7 @@ set_target_properties(emoticonstheme_adium PROPERTIES OUTPUT_NAME "adium" ) +set_target_properties(emoticonstheme_adium PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/emoticonsthemes") install( TARGETS emoticonstheme_adium DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.37.0/src/providers/kde/CMakeLists.txt new/kemoticons-5.38.0/src/providers/kde/CMakeLists.txt --- old/kemoticons-5.37.0/src/providers/kde/CMakeLists.txt 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/src/providers/kde/CMakeLists.txt 2017-09-02 23:18:22.000000000 +0200 @@ -15,6 +15,8 @@ set_target_properties(emoticonstheme_kde PROPERTIES OUTPUT_NAME "kde" ) +set_target_properties(emoticonstheme_kde PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/emoticonsthemes") + install( TARGETS emoticonstheme_kde DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.37.0/src/providers/pidgin/CMakeLists.txt new/kemoticons-5.38.0/src/providers/pidgin/CMakeLists.txt --- old/kemoticons-5.37.0/src/providers/pidgin/CMakeLists.txt 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/src/providers/pidgin/CMakeLists.txt 2017-09-02 23:18:22.000000000 +0200 @@ -11,6 +11,7 @@ set_target_properties(emoticonstheme_pidgin PROPERTIES OUTPUT_NAME "pidgin" ) +set_target_properties(emoticonstheme_pidgin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/emoticonsthemes") install( TARGETS emoticonstheme_pidgin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-5.37.0/src/providers/xmpp/CMakeLists.txt new/kemoticons-5.38.0/src/providers/xmpp/CMakeLists.txt --- old/kemoticons-5.37.0/src/providers/xmpp/CMakeLists.txt 2017-08-06 18:37:41.000000000 +0200 +++ new/kemoticons-5.38.0/src/providers/xmpp/CMakeLists.txt 2017-09-02 23:18:22.000000000 +0200 @@ -16,6 +16,7 @@ set_target_properties(emoticonstheme_xmpp PROPERTIES OUTPUT_NAME "xmpp" ) +set_target_properties(emoticonstheme_xmpp PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/emoticonsthemes") install( TARGETS emoticonstheme_xmpp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/emoticonsthemes
