Hello community, here is the log from the commit of package kldap for openSUSE:Factory checked in at 2016-05-31 12:16:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kldap (Old) and /work/SRC/openSUSE:Factory/.kldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kldap" Changes: -------- --- /work/SRC/openSUSE:Factory/kldap/kldap.changes 2016-03-26 15:15:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kldap.new/kldap.changes 2016-05-31 12:16:49.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:31:25 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:06:51 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:43:07 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- kldap-15.12.3.tar.xz New: ---- kldap-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kldap.spec ++++++ --- /var/tmp/diff_new_pack.Pz5UUq/_old 2016-05-31 12:16:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Pz5UUq/_new 2016-05-31 12:16:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: kldap -Version: 15.12.3 +Version: 16.04.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries @@ -48,7 +48,7 @@ BuildRequires: kwallet-devel >= %{kf5_version} BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: kxmlgui-devel >= %{kf5_version} -BuildRequires: libKF5AkonadiPrivate-devel >= 1.72.43 +BuildRequires: akonadi-server-devel BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 BuildRequires: libxslt-devel ++++++ kldap-15.12.3.tar.xz -> kldap-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.12.3/CMakeLists.txt new/kldap-16.04.1/CMakeLists.txt --- old/kldap-15.12.3/CMakeLists.txt 2015-11-14 11:16:08.000000000 +0100 +++ new/kldap-16.04.1/CMakeLists.txt 2016-04-26 22:18:51.000000000 +0200 @@ -3,7 +3,7 @@ project(KLdap) # ECM setup -find_package(ECM 5.14.0 CONFIG REQUIRED) +find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${KLdap_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -14,11 +14,11 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) -set(KF5_VERSION "5.12.0") -set(KLDAP_LIB_VERSION "4.80.0") +set(KF5_VERSION "5.19.0") +set(KLDAP_LIB_VERSION "5.2.1") ecm_setup_version(${KLDAP_LIB_VERSION} VARIABLE_PREFIX KLDAP VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kldap_version.h" @@ -34,18 +34,12 @@ find_package(Ldap) set_package_properties(Ldap PROPERTIES - DESCRIPTION "LDAP (Lightweight Directory Access Protocol) libraries" - URL "http://www.openldap.org"; TYPE RECOMMENDED PURPOSE "Needed to provide LDAP functionality in KDE" ) find_package(Sasl2) -set_package_properties(Sasl2 PROPERTIES - DESCRIPTION "The Cyrus-sasl library" - URL "http://www.cyrussasl.org"; - TYPE OPTIONAL -) +set_package_properties(Sasl2 PROPERTIES TYPE OPTIONAL) if (Ldap_FOUND) set(LDAP_FOUND 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.12.3/cmake/FindLdap.cmake new/kldap-16.04.1/cmake/FindLdap.cmake --- old/kldap-15.12.3/cmake/FindLdap.cmake 2015-11-14 11:16:08.000000000 +0100 +++ new/kldap-16.04.1/cmake/FindLdap.cmake 2016-04-26 22:18:51.000000000 +0200 @@ -1,12 +1,66 @@ -# - Try to find the LDAP client libraries -# Once done this will define +#.rst: +# FindLdap +# -------- # -# Ldap_FOUND - system has libldap -# Ldap_INCLUDE_DIRS - the ldap include directory -# Ldap_LIBRARIES - libldap + liblber (if found) library - +# Try to find the LDAP client libraries. +# +# This will define the following variables: +# +# ``Ldap_FOUND`` +# True if libldap is available. +# +# ``Ldap_VERSION`` +# The version of libldap +# +# ``Ldap_INCLUDE_DIRS`` +# This should be passed to target_include_directories() if +# the target is not used for linking +# +# ``Ldap_LIBRARIES`` +# The LDAP libraries (libldap + liblber if available) +# This can be passed to target_link_libraries() instead of +# the ``Ldap::Ldap`` target +# +# If ``Ldap_FOUND`` is TRUE, the following imported target +# will be available: +# +# ``Ldap::Ldap`` +# The LDAP library +# +# Since pre-5.0.0. +# +# Imported target since 5.1.41 +# +#============================================================================= +# Copyright 2006 Szombathelyi György <[email protected]> +# Copyright 2007-2016 Laurent Montel <[email protected]> +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= -find_path(Ldap_INCLUDE_DIRS ldap.h) +find_path(Ldap_INCLUDE_DIRS NAMES ldap.h) if(APPLE) find_library(Ldap_LIBRARIES NAMES LDAP @@ -44,4 +98,17 @@ VERSION_VAR Ldap_VERSION ) +if(Ldap_FOUND AND NOT TARGET Ldap::Ldap) + add_library(Ldap::Ldap UNKNOWN IMPORTED) + set_target_properties(Ldap::Ldap PROPERTIES + IMPORTED_LOCATION "${Ldap_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${Ldap_INCLUDE_DIRS}") +endif() + mark_as_advanced(Ldap_INCLUDE_DIRS Ldap_LIBRARIES Lber_LIBRARIES Ldap_VERSION) + +include(FeatureSummary) +set_package_properties(Ldap PROPERTIES + URL "http://www.openldap.org/"; + DESCRIPTION "LDAP (Lightweight Directory Access Protocol) libraries." +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.12.3/cmake/FindSasl2.cmake new/kldap-16.04.1/cmake/FindSasl2.cmake --- old/kldap-15.12.3/cmake/FindSasl2.cmake 2015-11-14 11:16:08.000000000 +0100 +++ new/kldap-16.04.1/cmake/FindSasl2.cmake 2016-04-26 22:18:51.000000000 +0200 @@ -1,22 +1,69 @@ +#.rst: +# FindSasl2 +# --------- # -# - Try to find the sasl2 directory library -# Once done this will define +# Try to find the SASL2 library. # -# Sasl2_FOUND - system has SASL2 -# Sasl2_INCLUDE_DIRS - the SASL2 include directory -# Sasl2_LIBRARIES - The libraries needed to use SASL2 - -# Copyright (c) 2006, 2007 Laurent Montel, <[email protected]> +# This will define the following variables: +# +# ``Sasl2_FOUND`` +# System has SASL2. +# +# ``Sasl2_VERSION`` +# The version of SASL2. +# +# ``Sasl2_INCLUDE_DIRS`` +# This should be passed to target_include_directories() if +# the target is not used for linking. +# +# ``Sasl2_LIBRARIES`` +# The SASL2 library. +# This can be passed to target_link_libraries() instead of +# the ``Sasl2::Sasl2`` target +# +# If ``Sasl2_FOUND`` is TRUE, the following imported target +# will be available: +# +# ``Sasl2::Sasl2`` +# The SASL2 library +# +# Since pre-5.0.0. +# +# Imported target since 5.1.41 # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +#============================================================================= +# Copyright 2006, 2007 Laurent Montel <[email protected]> +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= -# Note: libsasl2.pc doesn't export the include dir. +# NOTE: libsasl2.pc doesn't export the include dir. find_package(PkgConfig QUIET) pkg_check_modules(PC_Sasl2 libsasl2) -find_path(Sasl2_INCLUDE_DIRS sasl/sasl.h -) +find_path(Sasl2_INCLUDE_DIRS NAMES sasl/sasl.h) # libsasl2 add for windows, because the windows package of cyrus-sasl2 # contains a libsasl2 also for msvc which is not standard conform @@ -49,5 +96,18 @@ REQUIRED_VARS Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS VERSION_VAR Sasl2_VERSION ) +if(Sasl2_FOUND AND NOT TARGET Sasl2::Sasl2) + add_library(Sasl2::Sasl2 UNKNOWN IMPORTED) + set_target_properties(Sasl2::Sasl2 PROPERTIES + IMPORTED_LOCATION "${Sasl2_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${Sasl2_INCLUDE_DIRS}") +endif() mark_as_advanced(Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS Sasl2_VERSION) + +include(FeatureSummary) +set_package_properties(Sasl2 PROPERTIES + URL "http://www.cyrussasl.org/"; + DESCRIPTION "The Cyrus-sasl library." +) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.12.3/src/CMakeLists.txt new/kldap-16.04.1/src/CMakeLists.txt --- old/kldap-15.12.3/src/CMakeLists.txt 2015-11-14 11:16:08.000000000 +0100 +++ new/kldap-16.04.1/src/CMakeLists.txt 2016-04-26 22:18:51.000000000 +0200 @@ -70,8 +70,13 @@ ${kldap_EXTRA_LIBS} ) -target_include_directories(KF5Ldap INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KLDAP;${Ldap_INCLUDE_DIRS};${Sasl2_INCLUDE_DIRS}>") -target_include_directories(KF5Ldap PUBLIC "$<BUILD_INTERFACE:${KLdap_SOURCE_DIR}/src;${KLdap_BINARY_DIR}/src;${Ldap_INCLUDE_DIRS};${Sasl2_INCLUDE_DIRS}>") +target_include_directories(KF5Ldap INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KLDAP;${Ldap_INCLUDE_DIRS}>") +target_include_directories(KF5Ldap PUBLIC "$<BUILD_INTERFACE:${KLdap_SOURCE_DIR}/src;${KLdap_BINARY_DIR}/src;${Ldap_INCLUDE_DIRS}>") + +if(Sasl2_FOUND) + target_include_directories(KF5Ldap INTERFACE "$<INSTALL_INTERFACE:${Sasl2_INCLUDE_DIRS}>") + target_include_directories(KF5Ldap PUBLIC "$<BUILD_INTERFACE:${Sasl2_INCLUDE_DIRS}>") +endif() set_target_properties(KF5Ldap PROPERTIES VERSION ${KLDAP_VERSION_STRING}
