Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package prison-qt5 for openSUSE:Factory checked in at 2022-03-14 19:34:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prison-qt5 (Old) and /work/SRC/openSUSE:Factory/.prison-qt5.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prison-qt5" Mon Mar 14 19:34:59 2022 rev:65 rq:961287 version:5.92.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prison-qt5/prison-qt5.changes 2022-02-24 18:22:39.178671132 +0100 +++ /work/SRC/openSUSE:Factory/.prison-qt5.new.25692/prison-qt5.changes 2022-03-14 19:36:36.222093099 +0100 @@ -1,0 +2,13 @@ +Mon Mar 7 09:27:20 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.92.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.92.0 +- Changes since 5.91.0: + * Add Qt6 Android CI + * For KF6 use the more idiomatic include files installation layout + * Fix include dir for .pri file + * Normalise where headers are installed with the rest of KF + +------------------------------------------------------------------- Old: ---- prison-5.91.0.tar.xz prison-5.91.0.tar.xz.sig New: ---- prison-5.92.0.tar.xz prison-5.92.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prison-qt5.spec ++++++ --- /var/tmp/diff_new_pack.utVRkt/_old 2022-03-14 19:36:36.690093660 +0100 +++ /var/tmp/diff_new_pack.utVRkt/_new 2022-03-14 19:36:36.694093665 +0100 @@ -19,7 +19,7 @@ %define sonum 5 %define rname prison %define _libname KF5Prison -%define _tar_path 5.91 +%define _tar_path 5.92 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -27,7 +27,7 @@ # Only needed for the package signature condition %bcond_without released Name: prison-qt5 -Version: 5.91.0 +Version: 5.92.0 Release: 0 Summary: Barcode abstraction layer library License: MIT ++++++ prison-5.91.0.tar.xz -> prison-5.92.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.91.0/.gitlab-ci.yml new/prison-5.92.0/.gitlab-ci.yml --- old/prison-5.91.0/.gitlab-ci.yml 2022-02-05 16:19:33.000000000 +0100 +++ new/prison-5.92.0/.gitlab-ci.yml 2022-03-05 12:20:35.000000000 +0100 @@ -6,3 +6,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.91.0/CMakeLists.txt new/prison-5.92.0/CMakeLists.txt --- old/prison-5.91.0/CMakeLists.txt 2022-02-05 16:19:33.000000000 +0100 +++ new/prison-5.92.0/CMakeLists.txt 2022-03-05 12:20:35.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.91.0") # handled by release scripts +set(KF_VERSION "5.92.0") # handled by release scripts project(prison VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.91.0 NO_MODULE) +find_package(ECM 5.92.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${ECM_MODULE_PATH}") @@ -91,7 +91,15 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/prison_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/prison + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison + COMPONENT Devel +) + +# TODO KF6: remove this, kept for backwards-compatibility in KF5 so that #inlcude <prison/prison_version.h> +# continues working +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/prison_version.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/prison COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.91.0/src/lib/CMakeLists.txt new/prison-5.92.0/src/lib/CMakeLists.txt --- old/prison-5.91.0/src/lib/CMakeLists.txt 2022-02-05 16:19:33.000000000 +0100 +++ new/prison-5.92.0/src/lib/CMakeLists.txt 2022-03-05 12:20:35.000000000 +0100 @@ -64,7 +64,7 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/prison/>") +target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/Prison>") target_link_libraries(KF5Prison PUBLIC @@ -85,29 +85,40 @@ HEADER_NAMES AbstractBarcode Prison - PREFIX PRISON + PREFIX Prison REQUIRED_HEADERS Prison_HEADERS ) -# KF6: install to a path having both include visibility layer & namespace dir prefix: -# CamelCase includes to ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/Prison -# normal headers to ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/prison -# The generated cmake config files currently points behind the namespace dir prefix, by -# target_include_directories(KF5Prison INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/prison>") -# which should though point to before the namespace dir prefix level. -# Includes using <prison/*> only work currently due to the actual include base ${KDE_INSTALL_INCLUDEDIR_KF} -# also being set, via KF5_INSTALL_TARGETS_DEFAULT_ARGS. install(FILES - ${Prison_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/prison COMPONENT Devel) - -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/prison_export.h ${Prison_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/prison + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/prison COMPONENT Devel ) +# To keep backwards compatibility we stick with this layout for KF5, +# and use the Prison/Prison and Prison/prison layout for KF6 +if (QT_MAJOR_VERSION STREQUAL "5") + install(FILES + ${Prison_CamelCase_HEADERS} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/prison COMPONENT Devel) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/prison_export.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/prison + COMPONENT Devel + ) +else() + install(FILES + ${Prison_CamelCase_HEADERS} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison/Prison COMPONENT Devel) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/prison_export.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Prison + COMPONENT Devel + ) +endif() + if(BUILD_QCH) ecm_add_qch( KF5Prison_QCH @@ -136,6 +147,6 @@ # INCLUDE_INSTALL_DIR has to be without prison/ subdir # as the generated CamelCase headers have the prison/ path in the forward include -ecm_generate_pri_file(BASE_NAME Prison LIB_NAME KF5Prison DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}) +ecm_generate_pri_file(BASE_NAME Prison LIB_NAME KF5Prison DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/Prison) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
