diff --git a/.gitignore b/.gitignore index 15eb685..b6c89f4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /FeatherPad-0.6.1.tar.gz /FeatherPad-0.9.0.tar.gz /FeatherPad-0.9.3.tar.gz +/FeatherPad-0.15.0.tar.gz \ No newline at end of file diff --git a/featherpad.spec b/featherpad.spec index c154207..4979d7f 100644 --- a/featherpad.spec +++ b/featherpad.spec @@ -12,8 +12,8 @@ %global github_name FeatherPad Name: featherpad -Version: 0.9.3 -Release: 4%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Lightweight Qt5 Plain-Text Editor License: GPLv3+ @@ -24,12 +24,16 @@ Source0: %{url}/archive/V%{version}.tar.gz#/%{github_name}-%{version}.tar Source0: %{url}/archive/%{commit}.tar.gz#/%{github_name}-%{version}%{?git_ver}.tar.gz %endif # 0%%{?relbuild} +BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtx11extras-devel +BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(hunspell) >= 1.6 +BuildRequires: pkgconfig(xext) Requires: hicolor-icon-theme @@ -52,31 +56,24 @@ of any desktop environment and has: * Text zooming; * Appropriate but non-interrupting prompts; - %prep %if 0%{?relbuild} %autosetup -n %{github_name}-%{version} -p 1 -%else # 0%%{?relbuild} +%else %autosetup -n %{github_name}-%{commit} -p 1 -%endif # 0%%{?relbuild} +%endif %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. -%make_build -popd - +%cmake +%cmake_build %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +%cmake_install %find_lang %{name} --with-qt %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop - - %files -f %{name}.lang %license COPYING %doc ChangeLog INSTALL NEWS README.md @@ -85,11 +82,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/%{name} %{_datadir}/%{name}/help -%{_datadir}/%{name}/help_ja_JP +%{_datadir}/%{name}/help_* %dir %{_datadir}/%{name}/translations - %changelog +* Sun Sep 13 2020 Joe Walker - 0.15.0-1 +- Update to 0.15.0 +- Switch to cmake + * Mon Jul 27 2020 Fedora Release Engineering - 0.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 81cc209..90d4ca1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FeatherPad-0.9.3.tar.gz) = f06749b0ab57e6869bb6568367a7ef777a0f91c6a9229fe7892e720f48020ceac36d6948159b0516f4d1c920bff4ceb23f6b29a492d58908305856d2f03c2d36 +SHA512 (FeatherPad-0.15.0.tar.gz) = 8cac212e8110c1b39342e7bc85f3677f662058c1f78babe8006cdbced966a8dc403132522050a84f2aa043881310f9171caff0d5cc23a95f1dbf01f274cd86e8