Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2014-06-10 14:36:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcrash" Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2014-05-14 20:26:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcrash.new/kcrash.changes 2014-06-10 14:36:47.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jun 1 18:02:24 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.100.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta3.php +- Add baselibs.conf + +------------------------------------------------------------------- Old: ---- kcrash-4.99.0.tar.xz New: ---- baselibs.conf kcrash-4.100.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.EJBup1/_old 2014-06-10 14:36:48.000000000 +0200 +++ /var/tmp/diff_new_pack.EJBup1/_new 2014-06-10 14:36:48.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Crash5 Name: kcrash -Version: 4.99.0 +Version: 4.100.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 0.0.14 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem @@ -34,7 +34,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: kcrash-%{version}.tar.xz +Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ baselibs.conf ++++++ libKF5Crash5 kcrash-devel requires "libKF5Crash5-<targettype> = <version>" ++++++ kcrash-4.99.0.tar.xz -> kcrash-4.100.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.99.0/CMakeLists.txt new/kcrash-4.100.0/CMakeLists.txt --- old/kcrash-4.99.0/CMakeLists.txt 2014-05-04 22:14:43.000000000 +0200 +++ new/kcrash-4.100.0/CMakeLists.txt 2014-06-01 12:38:39.000000000 +0200 @@ -2,7 +2,7 @@ project(KCrash) -find_package(ECM 0.0.13 REQUIRED NO_MODULE) +find_package(ECM 0.0.14 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.2.0) @@ -22,17 +22,15 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.99.0") # handled by release scripts -set(KF5_DEP_VERSION "4.99.0") # handled by release scripts +set(KF5_VERSION "4.100.0") # handled by release scripts +set(KF5_DEP_VERSION "4.100.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCrash VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcrash_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CrashConfigVersion.cmake" SOVERSION 5) -if(NOT kdelibs_SOURCE_DIR) - find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) -endif() +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/po) include(ECMPoQmTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.99.0/autotests/CMakeLists.txt new/kcrash-4.100.0/autotests/CMakeLists.txt --- old/kcrash-4.99.0/autotests/CMakeLists.txt 2014-05-04 22:14:43.000000000 +0200 +++ new/kcrash-4.100.0/autotests/CMakeLists.txt 2014-06-01 12:38:39.000000000 +0200 @@ -1,6 +1,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) -include(ECMMarkAsTest) +include(ECMAddTests) find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG QUIET) @@ -15,20 +15,13 @@ return() endif() -macro(KCRASH_UNIT_TESTS) - foreach(_testname ${ARGN}) - add_executable(${_testname} ${_testname}.cpp) - add_test(kcrash-${_testname} ${_testname}) - target_link_libraries(${_testname} Qt5::Core Qt5::Test) - ecm_mark_as_test(${_testname}) - endforeach(_testname) -endmacro(KCRASH_UNIT_TESTS) - -kcrash_unit_tests( - kcrashtest +ecm_add_tests( + kcrashtest.cpp + NAME_PREFIX "kcrash-" + LINK_LIBRARIES Qt5::Core Qt5::Test ) add_executable(test_crasher test_crasher.cpp) target_link_libraries(test_crasher Qt5::Widgets KF5::Crash) ecm_mark_as_test(test_crasher) - +ecm_mark_nongui_executable(test_crasher) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.99.0/src/kcrash.cpp new/kcrash-4.100.0/src/kcrash.cpp --- old/kcrash-4.99.0/src/kcrash.cpp 2014-05-04 22:14:43.000000000 +0200 +++ new/kcrash-4.100.0/src/kcrash.cpp 2014-06-01 12:38:39.000000000 +0200 @@ -209,10 +209,16 @@ { s_launchDrKonqi = enabled ? 1 : 0; if (s_launchDrKonqi && !s_drkonqiPath) { - s_drkonqiPath = qstrdup(CMAKE_INSTALL_PREFIX "/" LIBEXEC_INSTALL_DIR "/drkonqi"); - if (!QFile::exists(QLatin1String(s_drkonqiPath))) { - qWarning() << "Could not find drkonqi at" << s_drkonqiPath; - s_launchDrKonqi = 0; + const QList<QString> paths = QFile::decodeName(qgetenv("LIBEXEC_PATH")).split(QLatin1Char(':')); + const QString exec = QStandardPaths::findExecutable(QLatin1String("drkonqi"), paths); + if (exec.isEmpty()) { + s_drkonqiPath = qstrdup(CMAKE_INSTALL_PREFIX "/" LIBEXEC_INSTALL_DIR "/drkonqi"); + if (!QFile::exists(QLatin1String(s_drkonqiPath))) { + qWarning() << "Could not find drkonqi at" << s_drkonqiPath; + s_launchDrKonqi = 0; + } + } else { + s_drkonqiPath = qstrdup(qPrintable(exec)); } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
