rpm/k3b
SHA256
1
0
Fork 0
forked from pool/k3b
Code Pull Requests Activity

Accepting request 1037651 from KDE:Applications

Browse Source 
Fix the knsrcfile location

OBS-URL: https://build.opensuse.org/request/show/1037651
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=142
This commit is contained in:
Dominique Leuenberger 2022-11-24 11:24:03 +00:00 committed by Git OBS Bridge
commit e20871f67c
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-remove-unnecessary-and-incorrect-version-check.patch Normal file
View File

@ -0,0 +1,30 @@
From 4413fa36189008c776c04a4dc2150c5e1bd1ef15 Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
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

6
k3b.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 23 16:33:08 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Add patch to fix knewstuff install location:
* 0001-remove-unnecessary-and-incorrect-version-check.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 1 11:19:57 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr> Tue Nov 1 11:19:57 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

8
k3b.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package k3b # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,9 +33,11 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%
Source2: applications.keyring Source2: applications.keyring
%endif %endif
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch1: Don-t-suggest-to-install-libburn.patch Patch0: Don-t-suggest-to-install-libburn.patch
# PATCH-FIX-OPENSUSE # 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: extra-cmake-modules
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flac-devel BuildRequires: flac-devel