Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hotspot for openSUSE:Factory checked in at 2022-03-21 20:12:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hotspot (Old) and /work/SRC/openSUSE:Factory/.hotspot.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hotspot" Mon Mar 21 20:12:19 2022 rev:4 rq:963536 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hotspot/hotspot.changes 2020-09-25 16:31:21.495881006 +0200 +++ /work/SRC/openSUSE:Factory/.hotspot.new.25692/hotspot.changes 2022-03-21 20:12:29.612468309 +0100 @@ -1,0 +2,8 @@ +Sun Mar 20 13:58:10 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Spec cleanup. +- Use %_libexec where needed. +- Add patch: + * 0001-CMake-Don-t-assume-KDE_INSTALL_-variables-are-relati.patch + +------------------------------------------------------------------- New: ---- 0001-CMake-Don-t-assume-KDE_INSTALL_-variables-are-relati.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hotspot.spec ++++++ --- /var/tmp/diff_new_pack.ZRtInf/_old 2022-03-21 20:12:30.156468852 +0100 +++ /var/tmp/diff_new_pack.ZRtInf/_new 2022-03-21 20:12:30.160468856 +0100 @@ -24,17 +24,18 @@ Group: Development/Tools/Debuggers Url: https://github.com/KDAB/hotspot Source: https://github.com/KDAB/hotspot/releases/download/v%{version}/hotspot-v%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-CMake-Don-t-assume-KDE_INSTALL_-variables-are-relati.patch BuildRequires: glibc-devel-static -BuildRequires: threadweaver-devel -BuildRequires: ki18n-devel -BuildRequires: kio-devel -BuildRequires: solid-devel -BuildRequires: kcoreaddons-devel -BuildRequires: threadweaver-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kitemmodels-devel -BuildRequires: kitemviews-devel -BuildRequires: kwindowsystem-devel +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5ItemViews) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5ThreadWeaver) +BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) @@ -48,20 +49,25 @@ around Linux perf. %prep -%setup -q -n %{name}-v%{version} +%autosetup -p1 -n %{name}-v%{version} %build %cmake_kf5 -d build %install -%cmake_install +%kf5_makeinstall -C build %files %license LICENSE.GPL.txt %doc README.md %{_kf5_bindir}/hotspot +%if %{pkg_vcmp kf5-filesystem >= 20220307} +%{_libexecdir}/hotspot-perfparser +%{_libexecdir}/elevate_perf_privileges.sh +%else %{_kf5_libdir}/libexec/hotspot-perfparser %{_kf5_libdir}/libexec/elevate_perf_privileges.sh +%endif %{_kf5_iconsdir}/hicolor/*/*/hotspot.png ++++++ 0001-CMake-Don-t-assume-KDE_INSTALL_-variables-are-relati.patch ++++++ >From 881d1213f77d16d6d37a9324f12bef3a2c407dfe Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Sun, 20 Mar 2022 15:14:54 +0100 Subject: [PATCH] CMake: Don't assume KDE_INSTALL_* variables are relative ECM only makes sure KDE_INSTALL_FULL_BINDIR and KDE_INSTALL_FULL_LIBEXECDIR contain absolute paths. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c5d6c7..a475d88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,8 +99,8 @@ include(ECMCoverageOption) include(ECMEnableSanitizers) file(RELATIVE_PATH LIBEXEC_REL_PATH - "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_BINDIR}" - "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBEXECDIR}") + "${KDE_INSTALL_FULL_BINDIR}" + "${KDE_INSTALL_FULL_LIBEXECDIR}") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/hotspot-config.h.cmake -- 2.35.1