diff --git a/0001-Always-use-local-CMake-modules-first.patch b/0001-Always-use-local-CMake-modules-first.patch new file mode 100644 index 0000000..210be34 --- /dev/null +++ b/0001-Always-use-local-CMake-modules-first.patch @@ -0,0 +1,25 @@ +From 496093bfcea2fbfa455f4299278685a90aaf1b13 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Sun, 19 Jul 2020 19:36:43 +0200 +Subject: [PATCH] Always use local CMake modules first + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5feb817..981c8a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,7 +3,7 @@ project (babe) + + set (KF5_MIN_VERSION "5.24.0") + find_package (ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules) ++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) + + include(KDEInstallDirs) + include(KDECMakeSettings) +-- +2.27.0 + diff --git a/babe.changes b/babe.changes index 9a9485a..06bc059 100644 --- a/babe.changes +++ b/babe.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 19 17:37:14 UTC 2020 - Christophe Giboudeaux + +- Add patch to fix build: + * 0001-Always-use-local-CMake-modules-first.patch + ------------------------------------------------------------------- Mon Feb 5 23:35:32 UTC 2018 - jengelh@inai.de diff --git a/babe.spec b/babe.spec index 3d1d2f9..f51543e 100644 --- a/babe.spec +++ b/babe.spec @@ -1,7 +1,7 @@ # # spec file for package babe # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,10 +20,12 @@ Name: babe Version: 1.2.1 Release: 0 Summary: A Qt music player with support for favorites -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Players URL: https://babe.kde.org Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Always-use-local-CMake-modules-first.patch BuildRequires: libqt5-qtbase-common-devel BuildRequires: libtag-devel BuildRequires: pkgconfig