From e4bb5c6918681690e1f9b0c1c9a5d8265145718e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 17:33:08 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index c7bf136..2fcca03 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 2.1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8ac61031985492b541c93c05bbb1d4f85ddd156d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 21:16:32 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 2fcca03..d6e6a57 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 2.1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7ba49749bea9c1c825f9e184413e3cf717dc76b2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 17 Jul 2025 23:56:15 +0200 Subject: [PATCH 3/5] Raise minimum CMake version, use GNUInstallDirs --- CMakeLists.txt | 11 ++++++----- qcustomplot.spec | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db8406f..51e9a02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(qcustomplot) +include(GNUInstallDirs) set(LIB_VER "" CACHE STRING "Library version") set(QT_VER "6" CACHE STRING "Target Qt version") @@ -23,12 +24,12 @@ endif() target_link_libraries(qcustomplot Qt${QT_VER}::Core Qt${QT_VER}::Gui Qt${QT_VER}::Widgets Qt${QT_VER}::PrintSupport) install(TARGETS qcustomplot - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # Headers install(FILES qcustomplot.h - DESTINATION include + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/qcustomplot.spec b/qcustomplot.spec index d6e6a57..2aaa8c8 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Thu Jul 17 2025 Sandro Mani - 2.1.1-12 +- Raise minimum CMake version, use GNUInstallDirs + * Sat Jan 18 2025 Fedora Release Engineering - 2.1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d17a6130a97c7f298c8c03a7b6e85849becf3131 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:23:03 +0000 Subject: [PATCH 4/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 2aaa8c8..7111ae4 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.1.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Sandro Mani - 2.1.1-12 - Raise minimum CMake version, use GNUInstallDirs From 50016a1b35218e573ba7e209b679a8de36724b14 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 12 Oct 2025 01:57:57 -0400 Subject: [PATCH 5/5] Fix dependencies The runtime libraries should not depend on themselves, and the -qt6-devel subpackage should require -qt6, not -qt5. --- qcustomplot.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 7111ae4..87b1b81 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -40,7 +40,6 @@ This package contains the Qt4 version. %package qt5 Summary: Qt widget for plotting and data visualization -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt5 QCustomPlot is a Qt C++ widget for plotting and data visualization. @@ -63,7 +62,6 @@ developing applications that use %{name} (Qt5). %if %{with qt6} %package qt6 Summary: Qt widget for plotting and data visualization -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt6 QCustomPlot is a Qt C++ widget for plotting and data visualization. @@ -76,7 +74,7 @@ This package contains the Qt6 version. %package qt6-devel Summary: Development files for %{name} (Qt6) -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} +Requires: %{name}-qt6%{?_isa} = %{version}-%{release} %description qt6-devel The %{name}-devel package contains libraries and header files for @@ -171,6 +169,9 @@ EOF %changelog +* Sun Oct 12 2025 Yaakov Selkowitz - 2.1.1-14 +- Fix dependencies + * Fri Jul 25 2025 Fedora Release Engineering - 2.1.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild