tsujan utils update

This commit is contained in:
Raven 2025-02-27 10:21:59 +06:00
parent 6bb9654f85
commit d1002a55bc
2 changed files with 12 additions and 22 deletions

View File

@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils
%if %{with clang} %if %{with clang}
BuildRequires: clang >= 5.0 BuildRequires: clang >= 5.0
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-toolset-14-gcc-c++
%endif %endif
BuildRequires: cmake >= 3.0 BuildRequires: cmake >= 3.0
%if %{with qt6} %if %{with qt6}
@ -43,6 +43,8 @@ Lightweight Qt hierarchical notes-manager for Linux
%if %{with clang} %if %{with clang}
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
%else
%enable_devtoolset14
%endif %endif
%cmake \ %cmake \

View File

@ -1,16 +1,9 @@
%global github_name FeatherPad %global github_name FeatherPad
%bcond_with clang %bcond_with clang
%bcond_without qt6
%if %{with qt6}
%global _qt Qt6
%else
%global _qt Qt5
%endif
Name: featherpad Name: featherpad
Version: 1.5.2 Version: 1.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Lightweight %{_qt} Plain-Text Editor Summary: Lightweight %{_qt} Plain-Text Editor
@ -23,18 +16,10 @@ BuildRequires: desktop-file-utils
%if %{with clang} %if %{with clang}
BuildRequires: clang >= 5.0 BuildRequires: clang >= 5.0
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-toolset-14-gcc-c++
%endif %endif
%if %{with qt6}
BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qtsvg-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(x11-xcb)
BuildRequires: pkgconfig(hunspell) >= 1.6 BuildRequires: pkgconfig(hunspell) >= 1.6
BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xext)
@ -67,12 +52,11 @@ of any desktop environment and has:
%if %{with clang} %if %{with clang}
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
%else
%enable_devtoolset14
%endif %endif
%cmake \ %cmake \
%if %{with qt6}
-DENABLE_QT5=OFF \
%endif
-DWITHOUT_X11=OFF -DWITHOUT_X11=OFF
%cmake_build %cmake_build
@ -92,11 +76,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/help %{_datadir}/%{name}/help
%{_datadir}/%{name}/help_* #{_datadir}/%{name}/help_*
%dir %{_datadir}/%{name}/translations %dir %{_datadir}/%{name}/translations
%{_datadir}/metainfo/featherpad.metainfo.xml %{_datadir}/metainfo/featherpad.metainfo.xml
%changelog %changelog
* Thu Jan 30 2025 Raven <raven@sysadmins.ws> - 1.6.0-1
- update to 1.6.0
- drop Qt5 support
* Mon Nov 11 2024 Raven <raven@sysadmins.ws> - 1.5.2-1 * Mon Nov 11 2024 Raven <raven@sysadmins.ws> - 1.5.2-1
- update to 1.5.2 - update to 1.5.2