From a55e6820ed0e8e56a661d1bba1d4188fa1fd2d8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 04:59:34 +0000 Subject: [PATCH 01/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index dd1c3f7..9f3131b 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.0.1 -Release: 5%{?pre:.%pre}%{?dist} +Release: 6%{?pre:.%pre}%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -150,6 +150,9 @@ EOF %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 2.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cd1f889f5b8a374a34e2c337e2c3392861d836b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:32:50 +0000 Subject: [PATCH 02/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 9f3131b..de3b817 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.0.1 -Release: 6%{?pre:.%pre}%{?dist} +Release: 7%{?pre:.%pre}%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -150,6 +150,9 @@ EOF %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2c0ca62c0ab29f16c3534919f01280dc2991075a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 29 Mar 2021 10:07:05 +0200 Subject: [PATCH 03/22] Update to 2.1.0 --- qcustomplot.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index de3b817..dd6203e 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -5,8 +5,8 @@ #global pre beta Name: qcustomplot -Version: 2.0.1 -Release: 7%{?pre:.%pre}%{?dist} +Version: 2.1.0 +Release: 1%{?pre:.%pre}%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -150,6 +150,9 @@ EOF %changelog +* Mon Mar 29 2021 Sandro Mani - 2.1.0-1 +- Update to 2.1.0 + * Wed Jan 27 2021 Fedora Release Engineering - 2.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 31cb647..033e739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (QCustomPlot.tar.gz) = a15598718146ed3c6b5d38530a56661c16269e530fe0dedb71b4cb2722b5733a3b57689d668a75994b79c19c6e61dcc133dbcb9ed77b93a165f4ac826a5685b9 +SHA512 (QCustomPlot.tar.gz) = abd34b65667859d2aa1cb4bcde4508b39e0ca452fa9b347cd65f49c667b34e0bf00cabcf19dafcc05a5d5b344731e505b0d0d4f3877f3f68a7e01d580d795b3a From 7b627434766867ec5c35bbdaea05a44b8b53fa34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:37:00 +0000 Subject: [PATCH 04/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index dd6203e..ebe63ea 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.0 -Release: 1%{?pre:.%pre}%{?dist} +Release: 2%{?pre:.%pre}%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -150,6 +150,9 @@ EOF %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 29 2021 Sandro Mani - 2.1.0-1 - Update to 2.1.0 From bf6abce8ec80af016e2ff5d75fdb12b2976a042e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 16:54:52 +0000 Subject: [PATCH 05/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index ebe63ea..66b717f 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.0 -Release: 2%{?pre:.%pre}%{?dist} +Release: 3%{?pre:.%pre}%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -150,6 +150,9 @@ EOF %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7617c16762ac42347e68f72f5c6ea4b348db4ca0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 23:52:52 +0000 Subject: [PATCH 06/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 66b717f..c2bc28c 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.0 -Release: 3%{?pre:.%pre}%{?dist} +Release: 4%{?pre:.%pre}%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -150,6 +150,9 @@ EOF %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 2.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c3e1c71979951d0a15ddfa9cb20fb298d922b4a6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 9 Nov 2022 10:08:57 +0100 Subject: [PATCH 07/22] Update to 2.1.1 --- qcustomplot.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index c2bc28c..dd49621 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -5,8 +5,8 @@ #global pre beta Name: qcustomplot -Version: 2.1.0 -Release: 4%{?pre:.%pre}%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: Qt widget for plotting and data visualization License: GPLv3+ @@ -102,7 +102,7 @@ includedir=%{_includedir} Name: %{name} Description: %{summary} -Version: %{version} +Version: 2.1.1 Cflags: -I\${includedir} Libs: -L\${libdir} -lqcustomplot EOF @@ -114,7 +114,7 @@ includedir=%{_includedir} Name: %{name}-qt5 Description: %{summary} -Version: %{version} +Version: 2.1.1 Cflags: -I\${includedir} Libs: -L\${libdir} -lqcustomplot-qt5 EOF @@ -150,6 +150,9 @@ EOF %changelog +* Wed Nov 09 2022 Sandro Mani - 2.1.1-1 +- Update to 2.1.1 + * Fri Jul 22 2022 Fedora Release Engineering - 2.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 033e739..25b6ede 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (QCustomPlot.tar.gz) = abd34b65667859d2aa1cb4bcde4508b39e0ca452fa9b347cd65f49c667b34e0bf00cabcf19dafcc05a5d5b344731e505b0d0d4f3877f3f68a7e01d580d795b3a +SHA512 (QCustomPlot.tar.gz) = 2e49a9b3f7ab03bcd580e5f3c3ae0d5e8c57d3ccce0ceed9862cde7ea23e2f3672a963af988be60e504cb5aa50bc462e4b28acf577eae41cc6fea2802642dc19 From 843c73c804320062200f39733ffc119ae499d75b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Nov 2022 22:29:44 +0100 Subject: [PATCH 08/22] Use SPDX license tag --- qcustomplot.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index dd49621..45c8ab7 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -9,7 +9,7 @@ Version: 2.1.1 Release: 1%{?dist} Summary: Qt widget for plotting and data visualization -License: GPLv3+ +License: GPL-3.0-or-later URL: http://www.qcustomplot.com/ Source0: http://www.qcustomplot.com/release/%{version}%{?pre:-%pre}/QCustomPlot.tar.gz Source1: %{name}.pro @@ -102,7 +102,7 @@ includedir=%{_includedir} Name: %{name} Description: %{summary} -Version: 2.1.1 +Version: %{version} Cflags: -I\${includedir} Libs: -L\${libdir} -lqcustomplot EOF @@ -114,15 +114,11 @@ includedir=%{_includedir} Name: %{name}-qt5 Description: %{summary} -Version: 2.1.1 +Version: %{version} Cflags: -I\${includedir} Libs: -L\${libdir} -lqcustomplot-qt5 EOF -%ldconfig_scriptlets - -%ldconfig_scriptlets qt5 - %files %license GPL.txt From 3d234972e6dda87fb7131337a8604d2dd2646205 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Nov 2022 10:30:26 +0100 Subject: [PATCH 09/22] Add Qt6 build, drop Qt4 build --- CMakeLists.txt | 32 ++++++++++++++ qcustomplot.pro | 14 ------ qcustomplot.spec | 111 +++++++++++++++++++++++++---------------------- 3 files changed, 90 insertions(+), 67 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 qcustomplot.pro diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..808cca9 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 2.8) +project(qcustomplot) + +set(SO_VER "" CACHE STRING "SO version") +set(QT_VER "6" CACHE STRING "Target Qt version") + +set(QCUSTOMPLOT_LIB_VERSION ${SO_VER}.0) +set(QCUSTOMPLOT_SO_VERSION ${SO_VER}) + +FIND_PACKAGE(Qt${QT_VER}Core REQUIRED) +FIND_PACKAGE(Qt${QT_VER}Gui REQUIRED) +FIND_PACKAGE(Qt${QT_VER}Widgets REQUIRED) +FIND_PACKAGE(Qt${QT_VER}PrintSupport REQUIRED) + +# Library +add_library(qcustomplot SHARED qcustomplot.cpp qcustomplot.h) +set_target_properties(qcustomplot PROPERTIES VERSION ${QCUSTOMPLOT_LIB_VERSION} SOVERSION ${QCUSTOMPLOT_SO_VERSION}) +if (${QT_VER} GREATER "4") +set_target_properties(qcustomplot PROPERTIES OUTPUT_NAME qcustomplot-qt${QT_VER}) +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} +) + +# Headers +install(FILES qcustomplot.h + DESTINATION include +) diff --git a/qcustomplot.pro b/qcustomplot.pro deleted file mode 100644 index e0c1054..0000000 --- a/qcustomplot.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = lib -VERSION = $$SOVERSION -TARGET = qcustomplot$$QTSUFFIX -QT = core gui widgets printsupport - -SOURCES = qcustomplot.cpp -HEADERS = qcustomplot.h - -target.path = $$LIBDIR -INSTALLS += target - -header.path = /usr/include -header.files = qcustomplot.h -INSTALLS += header \ No newline at end of file diff --git a/qcustomplot.spec b/qcustomplot.spec index 45c8ab7..da03e00 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,18 +6,19 @@ Name: qcustomplot Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later URL: http://www.qcustomplot.com/ Source0: http://www.qcustomplot.com/release/%{version}%{?pre:-%pre}/QCustomPlot.tar.gz -Source1: %{name}.pro +Source1: CMakeLists.txt +BuildRequires: cmake +BuildRequires: ninja-build BuildRequires: gcc-c++ -BuildRequires: make -BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel %description @@ -29,15 +30,6 @@ visualization applications. This package contains the Qt4 version. -%package devel -Summary: Development files for %{name} (Qt4) -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name} (Qt4). - - %package qt5 Summary: Qt widget for plotting and data visualization Requires: %{name}-qt5%{?_isa} = %{version}-%{release} @@ -57,7 +49,29 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt5-devel The %{name}-devel package contains libraries and header files for -developing applications that use %{name} (Qt5). +developing applications that use %{name} (Qt5). + + +%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. +This plotting library focuses on making good looking, publication quality 2D +plots, graphs and charts, as well as offering high performance for realtime +visualization applications. + +This package contains the Qt6 version. + + +%package qt6-devel +Summary: Development files for %{name} (Qt6) +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} + +%description qt6-devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name} (Qt6). %package doc @@ -75,28 +89,27 @@ cp -a %{SOURCE1} . %build -mkdir qt4 -( -cd qt4 -LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %qmake_qt4 SOVERSION=%{so_ver} LIBDIR=%{_libdir} .. -%make_build -) +%define _vpath_builddir %{_target_platform}-qt5 +%cmake -DQT_VER=5 -DSO_VER=%{so_ver} +%cmake_build -mkdir qt5 -( -cd qt5 -LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %qmake_qt5 SOVERSION=%{so_ver} QTSUFFIX=-qt5 LIBDIR=%{_libdir} .. -%make_build -) +%define _vpath_builddir %{_target_platform}-qt6 +%cmake -DQT_VER=6 -DSO_VER=%{so_ver} +%cmake_build %install -make -C qt4 INSTALL_ROOT=%{buildroot} install -make -C qt5 INSTALL_ROOT=%{buildroot} install +%define _vpath_builddir %{_target_platform}-qt5 +%cmake_install + +%define _vpath_builddir %{_target_platform}-qt6 +%cmake_install + +# pkg-config files +for qtver in -qt5 -qt6; do -# pkg-config file install -d %{buildroot}%{_libdir}/pkgconfig/ -cat > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc < %{buildroot}%{_libdir}/pkgconfig/%{name}$qtver.pc < %{buildroot}%{_libdir}/pkgconfig/%{name}-qt5.pc < - 2.1.1-2 +- Add Qt6 build, drop Qt4 build + * Wed Nov 09 2022 Sandro Mani - 2.1.1-1 - Update to 2.1.1 From a5124015c764b343274698ad0ce70ac732ef6067 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Nov 2022 16:10:22 +0100 Subject: [PATCH 10/22] Fix lib version --- CMakeLists.txt | 2 +- qcustomplot.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 808cca9..3b0abca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(qcustomplot) set(SO_VER "" CACHE STRING "SO version") set(QT_VER "6" CACHE STRING "Target Qt version") -set(QCUSTOMPLOT_LIB_VERSION ${SO_VER}.0) +set(QCUSTOMPLOT_LIB_VERSION ${SO_VER}) set(QCUSTOMPLOT_SO_VERSION ${SO_VER}) FIND_PACKAGE(Qt${QT_VER}Core REQUIRED) diff --git a/qcustomplot.spec b/qcustomplot.spec index da03e00..c91f0a1 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -148,6 +148,9 @@ done %changelog +* Mon Nov 28 2022 Sandro Mani - 2.1.1-3 +- Fix lib version + * Mon Nov 28 2022 Sandro Mani - 2.1.1-2 - Add Qt6 build, drop Qt4 build From 523adf549ab9dab43dfe88d017c8d7bc2bd41294 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Nov 2022 08:08:42 +0100 Subject: [PATCH 11/22] Set CMAKE_AUTOMOC to ON --- CMakeLists.txt | 1 + qcustomplot.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b0abca..e7c8c16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ FIND_PACKAGE(Qt${QT_VER}Core REQUIRED) FIND_PACKAGE(Qt${QT_VER}Gui REQUIRED) FIND_PACKAGE(Qt${QT_VER}Widgets REQUIRED) FIND_PACKAGE(Qt${QT_VER}PrintSupport REQUIRED) +SET(CMAKE_AUTOMOC ON) # Library add_library(qcustomplot SHARED qcustomplot.cpp qcustomplot.h) diff --git a/qcustomplot.spec b/qcustomplot.spec index c91f0a1..e64f6b0 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -148,6 +148,9 @@ done %changelog +* Tue Nov 29 2022 Sandro Mani - 2.1.1-4 +- Set CMAKE_AUTOMOC to ON + * Mon Nov 28 2022 Sandro Mani - 2.1.1-3 - Fix lib version From fee5cceb47caac30f523b5f63374b0f38dbf52d5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Nov 2022 08:28:49 +0100 Subject: [PATCH 12/22] Fix lib version take two --- CMakeLists.txt | 7 ++++--- qcustomplot.spec | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7c8c16..db8406f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,12 @@ cmake_minimum_required(VERSION 2.8) project(qcustomplot) -set(SO_VER "" CACHE STRING "SO version") +set(LIB_VER "" CACHE STRING "Library version") set(QT_VER "6" CACHE STRING "Target Qt version") -set(QCUSTOMPLOT_LIB_VERSION ${SO_VER}) -set(QCUSTOMPLOT_SO_VERSION ${SO_VER}) +set(QCUSTOMPLOT_LIB_VERSION ${LIB_VER}) +string(REPLACE "." ";" VERSION_LIST ${LIB_VER}) +list(GET VERSION_LIST 0 QCUSTOMPLOT_SO_VERSION) FIND_PACKAGE(Qt${QT_VER}Core REQUIRED) FIND_PACKAGE(Qt${QT_VER}Gui REQUIRED) diff --git a/qcustomplot.spec b/qcustomplot.spec index e64f6b0..bbdea16 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -1,7 +1,7 @@ # Bump this as appropriate when doing release updates, check i.e. with abi_compliance_checker # First digit: major, bump when incompatible changes were performed # Second digit: minor, bump when interface was extended -%global so_ver 2.0.0 +%global lib_ver 2.0.0 #global pre beta Name: qcustomplot @@ -90,11 +90,11 @@ cp -a %{SOURCE1} . %build %define _vpath_builddir %{_target_platform}-qt5 -%cmake -DQT_VER=5 -DSO_VER=%{so_ver} +%cmake -DQT_VER=5 -DLIB_VER=%{lib_ver} %cmake_build %define _vpath_builddir %{_target_platform}-qt6 -%cmake -DQT_VER=6 -DSO_VER=%{so_ver} +%cmake -DQT_VER=6 -DLIB_VER=%{lib_ver} %cmake_build @@ -150,6 +150,7 @@ done %changelog * Tue Nov 29 2022 Sandro Mani - 2.1.1-4 - Set CMAKE_AUTOMOC to ON +- Fix lib version take two * Mon Nov 28 2022 Sandro Mani - 2.1.1-3 - Fix lib version From bd4007eb5f3c7faceb314529ff505471ac997cb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 18:51:02 +0000 Subject: [PATCH 13/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index bbdea16..94bada9 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -148,6 +148,9 @@ done %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 29 2022 Sandro Mani - 2.1.1-4 - Set CMAKE_AUTOMOC to ON - Fix lib version take two From 221637d76d93501dc225efefe4387053e941ed60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 15:49:07 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 94bada9..ce6ce42 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -6,7 +6,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -148,6 +148,9 @@ done %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 2.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e4d63d7aafd4194628f3df0c85ed581bab8d3827 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 5 Oct 2023 22:45:41 +0200 Subject: [PATCH 15/22] Conditionalize qt6 build --- qcustomplot.spec | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index ce6ce42..6cd8839 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -4,9 +4,15 @@ %global lib_ver 2.0.0 #global pre beta +%if 0%{?rhel} +%bcond_with qt6 +%else +%bcond_without qt6 +%endif + Name: qcustomplot Version: 2.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -18,7 +24,9 @@ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: gcc-c++ BuildRequires: qt5-qtbase-devel +%if %{with qt6} BuildRequires: qt6-qtbase-devel +%endif %description @@ -52,6 +60,7 @@ The %{name}-devel package contains libraries and header files for 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} @@ -72,6 +81,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt6-devel The %{name}-devel package contains libraries and header files for developing applications that use %{name} (Qt6). +%endif %package doc @@ -93,23 +103,20 @@ cp -a %{SOURCE1} . %cmake -DQT_VER=5 -DLIB_VER=%{lib_ver} %cmake_build +%if %{with qt6} %define _vpath_builddir %{_target_platform}-qt6 %cmake -DQT_VER=6 -DLIB_VER=%{lib_ver} %cmake_build +%endif %install %define _vpath_builddir %{_target_platform}-qt5 %cmake_install -%define _vpath_builddir %{_target_platform}-qt6 -%cmake_install - -# pkg-config files -for qtver in -qt5 -qt6; do - install -d %{buildroot}%{_libdir}/pkgconfig/ -cat > %{buildroot}%{_libdir}/pkgconfig/%{name}$qtver.pc < %{buildroot}%{_libdir}/pkgconfig/%{name}-qt5.pc < %{buildroot}%{_libdir}/pkgconfig/%{name}-qt6.pc < - 2.1.1-7 +- Conditionalize qt6 build + * Fri Jul 21 2023 Fedora Release Engineering - 2.1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 548b53fc9bf27907a167526b0ea38c8e073127b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 09:28:03 +0000 Subject: [PATCH 16/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 6cd8839..073e5a1 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Oct 05 2023 Sandro Mani - 2.1.1-7 - Conditionalize qt6 build From 7d0645a62cccc68ad7c7d3edac5ad4d148a6f214 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 13:46:23 +0000 Subject: [PATCH 17/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- qcustomplot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcustomplot.spec b/qcustomplot.spec index 073e5a1..c7bf136 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -171,6 +171,9 @@ EOF %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 2.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e4bb5c6918681690e1f9b0c1c9a5d8265145718e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 17:33:08 +0000 Subject: [PATCH 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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