From e76754f78716b69a5a65621bc2fb397b19426884 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 29 Sep 2020 11:59:58 +0200 Subject: [PATCH] Rebased to dda311c snapshot with different bugfixes. Added Git hash to the version number (will be visible in About dialog). --- goldendict.spec | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index b1078dc..c3c5149 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,10 @@ %global owner goldendict -%global commit 6ca112b797e70774d252b3635d41b4c5d38ea9dd +%global commit dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: goldendict Version: 1.5 -Release: 0.28.RC2%{?dist} +Release: 0.29.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -21,17 +22,20 @@ BuildRequires: cmake(Qt5Help) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Xml) -BuildRequires: libXtst-devel -BuildRequires: hunspell-devel -BuildRequires: libvorbis-devel -BuildRequires: desktop-file-utils -BuildRequires: phonon-qt5-devel -BuildRequires: bzip2-devel -BuildRequires: lzo-devel -BuildRequires: libtiff-devel -BuildRequires: eb-devel + +BuildRequires: pkgconfig(phonon4qt5) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(lzo2) + BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: desktop-file-utils BuildRequires: libappstream-glib +BuildRequires: eb-devel Requires: qt5-qtsvg%{?_isa} Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} @@ -54,8 +58,8 @@ Contain doc files of %{name}. %prep %autosetup -n %{name}-%{commit} -p1 -rm -r qtsingleapplication -sed -e '/qtsingleapplication.pri/d' -i %{name}.pro +rm -rf {qtsingleapplication,maclibs,winlibs} +sed -e '/^VERSION =/s/$/%{shortcommit}/' -e '/qtsingleapplication.pri/d' -i %{name}.pro %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro @@ -83,6 +87,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Tue Sep 29 2020 Vitaly Zaitsev - 1.5-0.29.RC2 +- Rebased to dda311c snapshot with different bugfixes. + * Tue Jul 28 2020 Fedora Release Engineering - 1.5-0.28.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild