diff --git a/.gitignore b/.gitignore index 332c58b..708aa9e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /coolreader-cr3.2.32.tar.gz /coolreader-cr3.2.33.tar.gz /coolreader-cr3.2.34.tar.gz +/coolreader-cr3.2.50.tar.gz diff --git a/coolreader.spec b/coolreader.spec index 837b7f5..bf41c9d 100644 --- a/coolreader.spec +++ b/coolreader.spec @@ -1,26 +1,28 @@ -%define __cmake_in_source_build 1 Summary: Cross platform open source e-book reader Name: coolreader -Version: 3.2.34 -Release: 5%{?dist} -License: GPLv2 +Version: 3.2.50 +Release: 1%{?dist} +License: GPLv2+ URL: https://sourceforge.net/projects/crengine Source0: https://github.com/buggins/coolreader/archive/cr%{version}/coolreader-cr%{version}.tar.gz Source1: cr3.appdata.xml - +# https://github.com/buggins/coolreader/pull/204 Patch0: coolreader-0001-fix-paths-in-a-cr3.desktop-file.patch # https://github.com/buggins/coolreader/issues/80 +# https://github.com/buggins/coolreader/pull/205 Patch1: coolreader-0002-add-license-file.patch BuildRequires: gcc-c++ -BuildRequires: cmake >= 2.8.9 +BuildRequires: cmake BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(harfbuzz) -BuildRequires: pkgconfig(QtCore) -BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(libunibreak) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5LinguistTools) BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -32,36 +34,57 @@ HTML, EPUB, CHM, PDB, MOBI. %prep %autosetup -p1 -n %{name}-cr%{version} -%cmake \ - -DGUI=QT \ - -DMAX_IMAGE_SCALE_MUL=2 \ - -DDOC_DATA_COMPRESSION_LEVEL=3 \ - -DDOC_BUFFER_SIZE=0x140000 \ - . %build -%make_build +mkdir -p %{_vpath_builddir} +%cmake \ + -DGUI=QT5 \ + -DCMAKE_CXX_FLAGS="-DUSE_FREETYPE2" \ + -DCMAKE_BUILD_TYPE=Release \ + -DMAX_IMAGE_SCALE_MUL=2 \ + -DDOC_DATA_COMPRESSION_LEVEL=3 \ + -DDOC_BUFFER_SIZE=0x1400000 \ + . + +%cmake_build %install -%make_install +%cmake_install install -D -pm 644 %{SOURCE1} %{buildroot}%{_metainfodir}/cr3.appdata.xml +# gather locale files +%find_lang cr3 --with-qt --without-mo + %check desktop-file-validate %{buildroot}%{_datadir}/applications/cr3.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/cr3.appdata.xml -%files +%files -f cr3.lang %license LICENSE %{_bindir}/cr3 %{_datadir}/applications/cr3.desktop -%{_metainfodir}/cr3.appdata.xml -%{_datadir}/cr3 +%dir %{_datadir}/cr3 +%{_datadir}/cr3/*.css +%{_datadir}/cr3/backgrounds/ +%{_datadir}/cr3/hyph/ +%{_datadir}/cr3/textures/ %{_datadir}/pixmaps/cr3.* +%{_metainfodir}/cr3.appdata.xml %{_mandir}/man1/cr3.1* %doc %{_docdir}/cr3 %doc README.md %changelog +* Sat Dec 5 2020 Andy Mender - 3.2.50-1 +- Update to version 3.2.50 +- Add new BuildRequires libunibreak +- Build against Qt5, not Qt4 (Qt5 is tested by upstream) +- Use the cmake(foo) format for Qt5 BuildRequires +- Don't restrict minimal cmake version (3.17.0 in F32 already) +- Fix license from GPLv2 to GPLv2+ (never was GPLv2) +- Switch to out-of-source build (recommended by upstream) +- Properly install locales + * Mon Oct 12 2020 Jeff Law - 3.2.34-5 - Use __cmake_in_source_build diff --git a/sources b/sources index 9207d06..fe1ac23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (coolreader-cr3.2.34.tar.gz) = 3a83ab80d68a85f89cac0e8273f3da67220eb6090995d869a467db199aa699df39f150c6968ca1fbbf70571f266b1f6c9cc6e5ef3a99f125656f7033d7131296 +SHA512 (coolreader-cr3.2.50.tar.gz) = 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3