Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2019-08-19 21:00:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Mon Aug 19 21:00:01 2019 rev:70 rq:722434 version:5.61.0 Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2019-07-26 12:07:00.650881736 +0200 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new.22127/attica-qt5.changes 2019-08-19 21:00:08.796942746 +0200 @@ -1,0 +2,15 @@ +Wed Aug 7 17:55:39 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.61.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.61.0.php +- No code change since 5.60.0 +- Add 0001-Fix-the-attica-pkgconfig-file.patch + +------------------------------------------------------------------- +Fri Jul 19 11:37:22 UTC 2019 - Wolfgang Bauer <wba...@tmo.at> + +- Don't lower minimum Qt version anymore, it requires 5.11 now + +------------------------------------------------------------------- Old: ---- attica-5.60.0.tar.xz New: ---- 0001-Fix-the-attica-pkgconfig-file.patch attica-5.61.0.tar.xz attica-5.61.0.tar.xz.sig frameworks.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.xHYbOX/_old 2019-08-19 21:00:10.688942440 +0200 +++ /var/tmp/diff_new_pack.xHYbOX/_new 2019-08-19 21:00:10.700942438 +0200 @@ -19,20 +19,28 @@ %define sonum 5 %define rname attica %define _libname KF5Attica -%define _tar_path 5.60 +%define _tar_path 5.61 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +# Only needed for the package signature condition +%bcond_without lang Name: attica-qt5 -Version: 5.60.0 +Version: 5.61.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{rname}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{rname}-%{version}.tar.xz.sig +Source2: frameworks.keyring +%endif Source99: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-the-attica-pkgconfig-file.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -65,10 +73,7 @@ Development files for attica, Attica a library to access Open Collaboration Service servers. %prep -%setup -q -n %{rname}-%{version} -%if 0%{?suse_version} == 1500 -sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt -%endif +%autosetup -p1 -n %{rname}-%{version} %build %cmake_kf5 -d build ++++++ 0001-Fix-the-attica-pkgconfig-file.patch ++++++ >From a087b11dd85b856fd7cbae6cd87e60c91e75f80a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Thu, 8 Aug 2019 14:04:40 +0200 Subject: [PATCH] Fix the attica pkgconfig file. Summary: the file was unusable due to bogus version name, missing dependencies and wrong paths. Test Plan: Before: ``` prefix=/data/kde/inst exec_prefix=/data/kde/inst/bin libdir=lib64 includedir=include/KF5Attica Name: libKF5Attica Description: Qt library to access Open Collaboration Services #Requires: Version: .. Libs: -Llib64 -lKF5Attica Cflags: -Iinclude/KF5Attica ``` After: ``` prefix=/data/kde/inst exec_prefix=${prefix} libdir=/data/kde/inst/lib64 includedir=/data/kde/inst/include Name: libKF5Attica Description: Qt library to access Open Collaboration Services URL: https://www.kde.org Requires: Qt5Core Qt5Network Version: 5.61.0 Libs: -L/data/kde/inst/lib64 -lKF5Attica Cflags: -I/data/kde/inst/include/KF5/Attica ``` Subscribers: fvogt, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D23029 --- src/CMakeLists.txt | 1 + src/cmake/libKF5Attica.pc.cmake | 19 ++++++++++--------- src/cmake/libattica.pc.cmake | 11 ----------- 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 src/cmake/libattica.pc.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a423b0..27b329b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -199,6 +199,7 @@ install(FILES ${PRI_FILENAME} if(NOT WIN32) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/libKF5Attica.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libKF5Attica.pc + @ONLY ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libKF5Attica.pc DESTINATION ${KDE_INSTALL_LIBDIR}/pkgconfig diff --git a/src/cmake/libKF5Attica.pc.cmake b/src/cmake/libKF5Attica.pc.cmake index 75387fa..5dde7c8 100644 --- a/src/cmake/libKF5Attica.pc.cmake +++ b/src/cmake/libKF5Attica.pc.cmake @@ -1,11 +1,12 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX}/bin -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR}/KF5Attica +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=@KDE_INSTALL_FULL_LIBDIR@ +includedir=@KDE_INSTALL_FULL_INCLUDEDIR@ -Name: lib${ATTICA_LIB_SONAME} +Name: lib@ATTICA_LIB_SONAME@ Description: Qt library to access Open Collaboration Services -#Requires: -Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH} -Libs: -L${LIB_INSTALL_DIR} -l${ATTICA_LIB_SONAME} -Cflags: -I${INCLUDE_INSTALL_DIR}/KF5Attica +URL: https://www.kde.org +Requires: Qt5Core Qt5Network +Version: @ATTICA_VERSION_STRING@ +Libs: -L@KDE_INSTALL_FULL_LIBDIR@ -l@ATTICA_LIB_SONAME@ +Cflags: -I@KDE_INSTALL_FULL_INCLUDEDIR_KF5@/Attica diff --git a/src/cmake/libattica.pc.cmake b/src/cmake/libattica.pc.cmake deleted file mode 100644 index 9b73985..0000000 --- a/src/cmake/libattica.pc.cmake +++ /dev/null @@ -1,11 +0,0 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX}/bin -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR} - -Name: lib${ATTICA_LIB_SONAME} -Description: Qt library to access Open Collaboration Services -#Requires: -Version: ${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH} -Libs: -L${LIB_INSTALL_DIR} -l${ATTICA_LIB_SONAME} -Cflags: -I${INCLUDE_INSTALL_DIR} -- 2.22.0 ++++++ attica-5.60.0.tar.xz -> attica-5.61.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-5.60.0/CMakeLists.txt new/attica-5.61.0/CMakeLists.txt --- old/attica-5.60.0/CMakeLists.txt 2019-07-06 15:12:48.000000000 +0200 +++ new/attica-5.61.0/CMakeLists.txt 2019-08-03 21:30:09.000000000 +0200 @@ -1,15 +1,15 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.60.0") # handled by release scripts +set(KF5_VERSION "5.61.0") # handled by release scripts project(Attica VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.60.0 NO_MODULE) +find_package(ECM 5.61.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}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMSetupVersion)
