Hello community, here is the log from the commit of package kpty for openSUSE:Factory checked in at 2015-04-13 20:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-16 09:34:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kpty.new/kpty.changes 2015-04-13 20:27:51.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Apr 4 14:41:00 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * Expose to world whether KPty has been built with utempter library + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php +- Drop no longer needed ki18n-devel Requires of the devel subpackage + +------------------------------------------------------------------- Old: ---- kpty-5.8.0.tar.xz New: ---- kpty-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpty.spec ++++++ --- /var/tmp/diff_new_pack.VLIFKr/_old 2015-04-13 20:27:52.000000000 +0200 +++ /var/tmp/diff_new_pack.VLIFKr/_new 2015-04-13 20:27:52.000000000 +0200 @@ -16,18 +16,19 @@ # +%bcond_without lang %define lname libKF5Pty5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kpty -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kcoreaddons-devel >= %{kf5_version} +BuildRequires: kcoreaddons-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{kf5_version} +BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: utempter-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 @@ -47,7 +48,9 @@ %package -n %lname Summary: Interfacing with pseudo terminal devices Group: System/GUI/KDE +%if %{with lang} Recommends: %lname-lang = %{version} +%endif %description -n %lname This library provides primitives to interface with pseudo terminal devices @@ -59,8 +62,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kcoreaddons-devel >= %{kf5_version} -Requires: ki18n-devel >= %{kf5_version} +Requires: kcoreaddons-devel >= %{_tar_path} Requires: pkgconfig(Qt5Core) >= 5.2.0 %description devel @@ -78,15 +80,19 @@ %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} - %find_lang %{name}5 +%if %{with lang} +%find_lang %{name}5 +%endif %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%if %{with lang} %files -n %lname-lang -f %{name}5.lang +%endif %files -n %lname %defattr(-,root,root) ++++++ kpty-5.8.0.tar.xz -> kpty-5.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.8.0/CMakeLists.txt new/kpty-5.9.0/CMakeLists.txt --- old/kpty-5.8.0/CMakeLists.txt 2015-03-07 15:49:01.000000000 +0100 +++ new/kpty-5.9.0/CMakeLists.txt 2015-04-04 14:11:31.000000000 +0200 @@ -2,12 +2,13 @@ project(KPty) -find_package(ECM 1.8.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(REQUIRED_QT_VERSION 5.2) -set(KF5_VERSION "5.8.0") # handled by release scripts -set(KF5_DEP_VERSION "5.8.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_DEP_VERSION "5.9.0") # handled by release scripts +include(FeatureSummary) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) @@ -18,6 +19,16 @@ find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) endif() +if (UNIX) + find_package(UTEMPTER) + set_package_properties(UTEMPTER PROPERTIES + TYPE OPTIONAL + PURPOSE "Required by KPty for managing UTMP entries" +) + + set(HAVE_UTEMPTER ${UTEMPTER_FOUND}) +endif() + # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Pty") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.8.0/KF5PtyConfig.cmake.in new/kpty-5.9.0/KF5PtyConfig.cmake.in --- old/kpty-5.8.0/KF5PtyConfig.cmake.in 2015-03-07 15:49:01.000000000 +0100 +++ new/kpty-5.9.0/KF5PtyConfig.cmake.in 2015-04-04 14:11:31.000000000 +0200 @@ -1,7 +1,8 @@ @PACKAGE_INIT@ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") -find_dependency(KF5I18n "@KF5_DEP_VERSION@") + +set(KPty_HAVE_UTEMPTER "@UTEMPTER_FOUND@") include("${CMAKE_CURRENT_LIST_DIR}/KF5PtyTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.8.0/cmake/FindUTEMPTER.cmake new/kpty-5.9.0/cmake/FindUTEMPTER.cmake --- old/kpty-5.8.0/cmake/FindUTEMPTER.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kpty-5.9.0/cmake/FindUTEMPTER.cmake 2015-04-04 14:11:31.000000000 +0200 @@ -0,0 +1,27 @@ +# - Try to find the UTEMPTER directory notification library +# Once done this will define +# +# UTEMPTER_FOUND - system has UTEMPTER +# UTEMPTER_INCLUDE_DIR - the UTEMPTER include directory +# UTEMPTER_LIBRARIES - The libraries needed to use UTEMPTER + +# Copyright (c) 2015, Hrvoje Senjan, <hrvoje.sen...@gmail.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +find_path (UTEMPTER_INCLUDE_DIR utempter.h) + +find_library (UTEMPTER_LIBRARIES NAMES utempter ) + +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (UTEMPTER DEFAULT_MSG UTEMPTER_INCLUDE_DIR UTEMPTER_LIBRARIES) + +set_package_properties(UTEMPTER PROPERTIES + URL "ftp://ftp.altlinux.org/pub/people/ldv/utempter/"; + DESCRIPTION "Allows non-privileged applications such as terminal emulators to modify the utmp database without having to be setuid root." +) + +mark_as_advanced (UTEMPTER_INCLUDE_DIR UTEMPTER_LIBRARIES) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.8.0/src/CMakeLists.txt new/kpty-5.9.0/src/CMakeLists.txt --- old/kpty-5.8.0/src/CMakeLists.txt 2015-03-07 15:49:01.000000000 +0100 +++ new/kpty-5.9.0/src/CMakeLists.txt 2015-04-04 14:11:31.000000000 +0200 @@ -13,11 +13,16 @@ target_include_directories(KF5Pty INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KPty>") +if (UTEMPTER_FOUND) + include_directories(${UTEMPTER_INCLUDE_DIR}) + set(kpty_OPTIONAL_LIBS ${UTEMPTER_LIBRARIES}) +endif () + target_link_libraries(KF5Pty PUBLIC Qt5::Core KF5::CoreAddons # KProcess PRIVATE ${UTIL_LIBRARY} - ${UTEMPTER_LIBRARY} + ${kpty_OPTIONAL_LIBS} KF5::I18n) target_include_directories(KF5Pty PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.8.0/src/ConfigureChecks.cmake new/kpty-5.9.0/src/ConfigureChecks.cmake --- old/kpty-5.8.0/src/ConfigureChecks.cmake 2015-03-07 15:49:01.000000000 +0100 +++ new/kpty-5.9.0/src/ConfigureChecks.cmake 2015-04-04 14:11:31.000000000 +0200 @@ -19,12 +19,7 @@ set(UTIL_LIBRARY) - check_library_exists(utempter addToUtmp "" HAVE_ADDTOUTEMP) - check_include_files(utempter.h HAVE_UTEMPTER_H) - if (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) - set(HAVE_UTEMPTER 1) - set(UTEMPTER_LIBRARY utempter) - else (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) + if (NOT UTEMPTER_FOUND) check_function_exists(login login_in_libc) if (NOT login_in_libc) check_library_exists(util login "" login_in_libutil) @@ -55,7 +50,7 @@ endif (login_in_libc OR login_in_libutil) check_struct_has_member("struct ${utmp}" "ut_syslen" "${utmp}.h" HAVE_STRUCT_UTMP_UT_SYSLEN) check_struct_has_member("struct ${utmp}" "ut_id" "${utmp}.h" HAVE_STRUCT_UTMP_UT_ID) - endif (HAVE_ADDTOUTEMP AND HAVE_UTEMPTER_H) + endif (NOT UTEMPTER_FOUND) check_function_exists(openpty openpty_in_libc) if (NOT openpty_in_libc)
