Hello community, here is the log from the commit of package kpty for openSUSE:Factory checked in at 2016-11-17 12:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpty (Old) and /work/SRC/openSUSE:Factory/.kpty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpty" Changes: -------- --- /work/SRC/openSUSE:Factory/kpty/kpty.changes 2016-10-28 12:27:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kpty.new/kpty.changes 2016-11-17 12:36:04.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Nov 5 22:10:09 UTC 2016 - [email protected] + +- Update to 5.28.0 + * Use ulog-helper on FreeBSD isntead of utempter + * Search harder for utempter using basic cmake prefix as well + * Workaround find_program ( utempter ...) failure(s) + * Use ECM path to find utempter binary, + more reliable than simple cmake prefix + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.28.0.php +- Drop upstreamed find-utempter-better.patch + +------------------------------------------------------------------- Old: ---- find-utempter-better.patch kpty-5.27.0.tar.xz New: ---- kpty-5.28.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpty.spec ++++++ --- /var/tmp/diff_new_pack.YWvMSO/_old 2016-11-17 12:36:05.000000000 +0100 +++ /var/tmp/diff_new_pack.YWvMSO/_new 2016-11-17 12:36:05.000000000 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Pty5 -%define _tar_path 5.27 +%define _tar_path 5.28 Name: kpty -Version: 5.27.0 +Version: 5.28.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -38,8 +38,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -#PATCH-FIX-UPSTREAM: find-utempter-better.patch - find utempter correctly to properly build kwrited afterwards -Patch0: find-utempter-better.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,7 +73,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build ++++++ kpty-5.27.0.tar.xz -> kpty-5.28.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.27.0/CMakeLists.txt new/kpty-5.28.0/CMakeLists.txt --- old/kpty-5.27.0/CMakeLists.txt 2016-10-06 22:57:41.000000000 +0200 +++ new/kpty-5.28.0/CMakeLists.txt 2016-11-05 15:56:27.000000000 +0100 @@ -3,15 +3,15 @@ project(KPty) 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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(REQUIRED_QT_VERSION 5.5.0) -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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.27.0/cmake/FindUTEMPTER.cmake new/kpty-5.28.0/cmake/FindUTEMPTER.cmake --- old/kpty-5.27.0/cmake/FindUTEMPTER.cmake 2016-10-06 22:57:41.000000000 +0200 +++ new/kpty-5.28.0/cmake/FindUTEMPTER.cmake 2016-11-05 15:56:27.000000000 +0100 @@ -32,12 +32,26 @@ # SUCH DAMAGE. -find_program (UTEMPTER_EXECUTABLE utempter PATHS +# use find_file instead of find_program until this is fixed: +# https://gitlab.kitware.com/cmake/cmake/issues/10468 +find_file (UTEMPTER_EXECUTABLE utempter PATHS ${KDE_INSTALL_FULL_LIBEXECDIR}/utempter ${KDE_INSTALL_FULL_LIBDIR}/utempter + ${CMAKE_PREFIX_PATH}/libexec/utempter + ${CMAKE_PREFIX_PATH}/lib/utempter /usr/libexec/utempter ) +# On FreeBSD for example we have to use ulog-helper +if (NOT UTEMPTER_EXECUTABLE) + find_program (UTEMPTER_EXECUTABLE ulog-helper PATHS + /usr/libexec + ) + if (UTEMPTER_EXECUTABLE) + add_definitions(-DUTEMPTER_ULOG=1) + endif () +endif () + if (UTEMPTER_EXECUTABLE) add_definitions(-DUTEMPTER_PATH=\"${UTEMPTER_EXECUTABLE}\") endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.27.0/src/kpty.cpp new/kpty-5.28.0/src/kpty.cpp --- old/kpty-5.27.0/src/kpty.cpp 2016-10-06 22:57:41.000000000 +0200 +++ new/kpty-5.28.0/src/kpty.cpp 2016-11-05 15:56:27.000000000 +0100 @@ -74,6 +74,14 @@ #endif #ifdef UTEMPTER_PATH +// utempter uses 'add' and 'del' whereas ulog-helper uses 'login' and 'logout' +# ifndef UTEMPTER_ULOG +# define UTEMPTER_ADD "add" +# define UTEMPTER_DEL "del" +# else +# define UTEMPTER_ADD "login" +# define UTEMPTER_DEL "logout" +# endif class UtemptProcess : public QProcess { public: @@ -517,7 +525,7 @@ UtemptProcess utemptProcess; utemptProcess.cmdFd = d->masterFd; utemptProcess.setProgram(d->utempterPath); - utemptProcess.setArguments(QStringList() << QStringLiteral("add") << QString::fromLocal8Bit(remotehost)); + utemptProcess.setArguments(QStringList() << QStringLiteral(UTEMPTER_ADD) << QString::fromLocal8Bit(remotehost)); utemptProcess.setProcessChannelMode(QProcess::ForwardedChannels); utemptProcess.start(); utemptProcess.waitForFinished(); @@ -606,7 +614,7 @@ UtemptProcess utemptProcess; utemptProcess.cmdFd = d->masterFd; utemptProcess.setProgram(d->utempterPath); - utemptProcess.setArguments(QStringList(QStringLiteral("del"))); + utemptProcess.setArguments(QStringList(QStringLiteral(UTEMPTER_DEL))); utemptProcess.setProcessChannelMode(QProcess::ForwardedChannels); utemptProcess.start(); utemptProcess.waitForFinished();
