forked from pool/diskmonitor
Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 9ffa0e8070 | |||
|
|
714a7b26b3 | ||
| 7a6d4ce232 | |||
|
|
840b010b09 |
30
diskmonitor-cmake4.patch
Normal file
30
diskmonitor-cmake4.patch
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
From ec8d1438dfe9535f1ee2ee229c74d331e5da9238 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christophe Marin <christophe@krop.fr>
|
||||||
|
Date: Tue, 1 Apr 2025 14:31:41 +0200
|
||||||
|
Subject: [PATCH] Fix build with CMake 4
|
||||||
|
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 5 +----
|
||||||
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 20a88b3..02858b3 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -6,12 +6,9 @@ set(DISKMONITOR_VERSION "${DISKMONITOR_VERSION_MAJOR}.${DISKMONITOR_VERSION_MINO
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
+cmake_minimum_required(VERSION 3.16)
|
||||||
|
set (QT_MIN_VERSION "5.2.0")
|
||||||
|
|
||||||
|
-# Suppress warning with CMake >= 3.3
|
||||||
|
-cmake_policy(SET CMP0063 NEW)
|
||||||
|
-
|
||||||
|
find_package(ECM 1.6.0 REQUIRED NO_MODULE)
|
||||||
|
set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
|
||||||
|
|
||||||
|
--
|
||||||
|
2.49.0
|
||||||
|
|
||||||
@@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 1 12:32:37 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add patch:
|
||||||
|
* diskmonitor-cmake4.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 20 12:10:24 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Stop using the %suse_update_desktop_file macro
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 14 13:18:06 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
Tue Dec 14 13:18:06 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package diskmonitor
|
# spec file for package diskmonitor
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2025 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
|
||||||
@@ -12,22 +12,23 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# 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/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: diskmonitor
|
Name: diskmonitor
|
||||||
Version: 0.3.4
|
Version: 0.3.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Tools to monitor SMART devices and MDRaid health status
|
Summary: Tools to monitor SMART devices and MDRaid health status
|
||||||
License: GPL-2.0-only
|
License: GPL-2.0-only
|
||||||
Group: Hardware/Other
|
|
||||||
URL: https://github.com/papylhomme/diskmonitor
|
URL: https://github.com/papylhomme/diskmonitor
|
||||||
Source0: https://github.com/papylhomme/diskmonitor/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/papylhomme/diskmonitor/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch0: 0001-Install-the-application-icon-in-the-right-directory.patch
|
Patch0: 0001-Install-the-application-icon-in-the-right-directory.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch1: diskmonitor-cmake4.patch
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: update-desktop-files
|
|
||||||
BuildRequires: cmake(KF5ConfigWidgets)
|
BuildRequires: cmake(KF5ConfigWidgets)
|
||||||
BuildRequires: cmake(KF5CoreAddons)
|
BuildRequires: cmake(KF5CoreAddons)
|
||||||
BuildRequires: cmake(KF5I18n)
|
BuildRequires: cmake(KF5I18n)
|
||||||
@@ -67,13 +68,12 @@ Applet:
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%kf5_makeinstall -C build
|
%kf5_makeinstall -C build
|
||||||
|
|
||||||
%suse_update_desktop_file diskmonitor Monitor
|
|
||||||
|
|
||||||
%find_lang diskmonitor diskmonitor.lang
|
%find_lang diskmonitor diskmonitor.lang
|
||||||
%find_lang plasma_applet_org.papylhomme.diskmonitor diskmonitor.lang
|
%find_lang plasma_applet_org.papylhomme.diskmonitor diskmonitor.lang
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user