Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at 2022-11-24 12:24:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k3b (Old) and /work/SRC/openSUSE:Factory/.k3b.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3b" Thu Nov 24 12:24:03 2022 rev:142 rq:1037651 version:22.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/k3b/k3b.changes 2022-11-04 17:37:35.153631981 +0100 +++ /work/SRC/openSUSE:Factory/.k3b.new.1597/k3b.changes 2022-11-24 12:24:06.825634797 +0100 @@ -1,0 +2,6 @@ +Wed Nov 23 16:33:08 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix knewstuff install location: + * 0001-remove-unnecessary-and-incorrect-version-check.patch + +------------------------------------------------------------------- New: ---- 0001-remove-unnecessary-and-incorrect-version-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.5cB5Sb/_old 2022-11-24 12:24:07.417638559 +0100 +++ /var/tmp/diff_new_pack.5cB5Sb/_new 2022-11-24 12:24:07.421638584 +0100 @@ -1,7 +1,7 @@ # # spec file for package k3b # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,9 +33,11 @@ Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE -Patch1: Don-t-suggest-to-install-libburn.patch +Patch0: Don-t-suggest-to-install-libburn.patch # PATCH-FIX-OPENSUSE -Patch2: 0001-Revert-Enable-the-k3b-helper-by-default.patch +Patch1: 0001-Revert-Enable-the-k3b-helper-by-default.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-remove-unnecessary-and-incorrect-version-check.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: flac-devel ++++++ 0001-remove-unnecessary-and-incorrect-version-check.patch ++++++ >From 4413fa36189008c776c04a4dc2150c5e1bd1ef15 Mon Sep 17 00:00:00 2001 From: Harald Sitter <[email protected]> Date: Fri, 21 Oct 2022 12:28:26 +0200 Subject: [PATCH] remove unnecessary (and incorrect) version check k3b already depends on kf5.88, no point having code for older versions --- src/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 09a59f3..20ced14 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -269,11 +269,7 @@ install( FILES k3b.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} ) install( FILES k3bui.rc k3bdeviceui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/k3b ) install( FILES org.kde.k3b.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) -if (${ECM_VERSION} STRGREATER "5.58.0") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/option/k3btheme.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) -else() - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/option/k3btheme.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) -endif() +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/option/k3btheme.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) set( SHARED_MIME_INFO_MINIMUM_VERSION "0.23" ) find_package( SharedMimeInfo REQUIRED ) -- 2.38.1
