diff --git a/base/feathernotes/feathernotes.spec b/base/feathernotes/feathernotes.spec index 98fcf76..beb4186 100644 --- a/base/feathernotes/feathernotes.spec +++ b/base/feathernotes/feathernotes.spec @@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils %if %{with clang} BuildRequires: clang >= 5.0 %else -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-14-gcc-c++ %endif BuildRequires: cmake >= 3.0 %if %{with qt6} @@ -43,6 +43,8 @@ Lightweight Qt hierarchical notes-manager for Linux %if %{with clang} export CC=clang export CXX=clang++ +%else +%enable_devtoolset14 %endif %cmake \ diff --git a/base/featherpad/featherpad.spec b/base/featherpad/featherpad.spec index 9dea72e..97c2f3f 100644 --- a/base/featherpad/featherpad.spec +++ b/base/featherpad/featherpad.spec @@ -1,16 +1,9 @@ %global github_name FeatherPad %bcond_with clang -%bcond_without qt6 - -%if %{with qt6} -%global _qt Qt6 -%else -%global _qt Qt5 -%endif Name: featherpad -Version: 1.5.2 +Version: 1.6.0 Release: 1%{?dist} Summary: Lightweight %{_qt} Plain-Text Editor @@ -23,18 +16,10 @@ BuildRequires: desktop-file-utils %if %{with clang} BuildRequires: clang >= 5.0 %else -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-14-gcc-c++ %endif -%if %{with qt6} BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtsvg-devel -%else -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: qt5-linguist -%endif BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(hunspell) >= 1.6 BuildRequires: pkgconfig(xext) @@ -67,12 +52,11 @@ of any desktop environment and has: %if %{with clang} export CC=clang export CXX=clang++ +%else +%enable_devtoolset14 %endif %cmake \ -%if %{with qt6} - -DENABLE_QT5=OFF \ -%endif -DWITHOUT_X11=OFF %cmake_build @@ -92,11 +76,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/%{name} %{_datadir}/%{name}/help -%{_datadir}/%{name}/help_* +#{_datadir}/%{name}/help_* %dir %{_datadir}/%{name}/translations %{_datadir}/metainfo/featherpad.metainfo.xml %changelog +* Thu Jan 30 2025 Raven - 1.6.0-1 +- update to 1.6.0 +- drop Qt5 support + * Mon Nov 11 2024 Raven - 1.5.2-1 - update to 1.5.2