From 6264b81a6168d8ac1c93e3cdd2421c09a2bc84a5 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Nov 15 2015 14:50:06 +0000 Subject: Update to 7.5 - Build with qt5 --- diff --git a/.gitignore b/.gitignore index 163f1ab..a47a913 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ kchmviewer-5.2.tar.gz /kchmviewer-6.0.tar.gz /kchmviewer-7.1.tar.gz /kchmviewer-7.3.tar.gz +/kchmviewer-7.5.tar.gz diff --git a/kchmviewer.spec b/kchmviewer.spec index ab0a50c..823481d 100644 --- a/kchmviewer.spec +++ b/kchmviewer.spec @@ -1,5 +1,5 @@ Name: kchmviewer -Version: 7.3 +Version: 7.5 Release: 1%{?dist} Summary: CHM viewer @@ -14,9 +14,9 @@ BuildRequires: gcc-c++ BuildRequires: chmlib-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: qt4-devel +BuildRequires: qt5-qtbase-devel BuildRequires: libzip-devel -BuildRequires: qtwebkit-devel +BuildRequires: qt5-qtwebkit-devel Requires: %{name}-common = %{version}-%{release} @@ -38,7 +38,7 @@ Common data files for KchmViewer. %build # make the Qt-only version -%_qt4_qmake +%_qt5_qmake make %install @@ -47,6 +47,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} cp -p bin/%{name} $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/ cp -p packages/%{name}.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ +sed -i -E 's/(MimeType.*)/\1;/' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop install -Dpm 644 packages/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png %check @@ -81,6 +82,10 @@ fi %changelog +* Sun Nov 15 2015 Robin Lee - 7.5-1 +- Update to 7.5 +- Build with qt5 + * Sun Oct 11 2015 Robin Lee - 7.3-1 - Update to 7.3 - Build only the qt version, since kde4 is obsolete in Fedora and kchmviewer diff --git a/sources b/sources index 1684c9a..ef98c86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d62647d897f9196ade034363e0d58c13 kchmviewer-7.3.tar.gz +8de084103375a33833ba5331a89ff7b9 kchmviewer-7.5.tar.gz