diff --git a/CMakeLists.txt b/CMakeLists.txt index 51e9a02..db8406f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 2.8) project(qcustomplot) -include(GNUInstallDirs) set(LIB_VER "" CACHE STRING "Library version") set(QT_VER "6" CACHE STRING "Target Qt version") @@ -24,12 +23,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 ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} ) # Headers install(FILES qcustomplot.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + DESTINATION include ) diff --git a/qcustomplot.spec b/qcustomplot.spec index 87b1b81..c7bf136 100644 --- a/qcustomplot.spec +++ b/qcustomplot.spec @@ -12,7 +12,7 @@ Name: qcustomplot Version: 2.1.1 -Release: 14%{?dist} +Release: 9%{?dist} Summary: Qt widget for plotting and data visualization License: GPL-3.0-or-later @@ -40,6 +40,7 @@ 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. @@ -62,6 +63,7 @@ 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. @@ -74,7 +76,7 @@ This package contains the Qt6 version. %package qt6-devel Summary: Development files for %{name} (Qt6) -Requires: %{name}-qt6%{?_isa} = %{version}-%{release} +Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %description qt6-devel The %{name}-devel package contains libraries and header files for @@ -169,21 +171,6 @@ 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 - -* 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 - -* 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