diff --git a/.gitignore b/.gitignore index 145eca2..81a9d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /yacreader-9.5.0-src.tar.xz +/yacreader-9.6.0.tar.gz diff --git a/0001-Fix-YACReader-build-for-Qt-5.7.patch b/0001-Fix-YACReader-build-for-Qt-5.7.patch deleted file mode 100644 index baf5adb..0000000 --- a/0001-Fix-YACReader-build-for-Qt-5.7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1fbf1195b997c11509afce8d4a7322e7561ab301 Mon Sep 17 00:00:00 2001 -From: Felix Kauselmann -Date: Sun, 1 Jul 2018 14:39:46 +0200 -Subject: [PATCH] Fix YACReader build for Qt <= 5.7 - ---- - YACReader/main.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/YACReader/main.cpp b/YACReader/main.cpp -index c6bf9c3..7e318ce 100644 ---- a/YACReader/main.cpp -+++ b/YACReader/main.cpp -@@ -83,8 +83,14 @@ int main(int argc, char * argv[]) - QCommandLineOption comicId("comicId", "", "comicId"); - QCommandLineOption libraryId("libraryId", "", "libraryId"); - // hide comicId and libraryId from help -+ #if QT_VERSION >= 0x050800 - comicId.setFlags(QCommandLineOption::HiddenFromHelp); - libraryId.setFlags(QCommandLineOption::HiddenFromHelp); -+ #else -+ comicId.setHidden(true); -+ libraryId.setHidden(true); -+ #endif -+ - // process - parser.addOption(comicId); - parser.addOption(libraryId); --- -2.18.0 - diff --git a/sources b/sources index e3e0f46..afdf070 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yacreader-9.5.0-src.tar.xz) = 6cd3b12b6f5ee7197fb3ac6e81f447678395c1dfffb562f133051825921f3056f3a439761fd8d6311e6af91c42a1004b88c79f8b9ed7dec190bd0a4eb9554f51 +SHA512 (yacreader-9.6.0.tar.gz) = 29b26c129408c8207d4e54e5328cc1fd94603773b209fb7ba3f20b65f997beaa9b5533fa30d1034092bb665f3e00fb11a0871b6c181eac99d22ccc8536513679 diff --git a/yacreader.spec b/yacreader.spec index 1874d87..75c9e40 100644 --- a/yacreader.spec +++ b/yacreader.spec @@ -1,8 +1,8 @@ -%global app_name YACReader +%global appname YACReader Name: yacreader -Version: 9.5.0 -Release: 7%{?dist} +Version: 9.6.0 +Release: 1%{?dist} Summary: Cross platform comic reader and library manager # The entire source code is GPLv3+ except: @@ -11,8 +11,7 @@ Summary: Cross platform comic reader and library manager # MIT: pictureflow License: GPLv3+ and BSD and MIT URL: https://www.yacreader.com -Source0: https://github.com/YACReader/%{name}/releases/download/%{version}/%{name}-%{version}-src.tar.xz -Patch0: 0001-Fix-YACReader-build-for-Qt-5.7.patch +Source0: https://github.com/YACReader/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -22,46 +21,55 @@ BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5ScriptTools) BuildRequires: pkgconfig(libunarr) BuildRequires: pkgconfig(poppler-qt5) - Requires: hicolor-icon-theme +%{?systemd_requires} %description -Best comic reader and comic manager with support for .cbr .cbz .zip .rar comic -files. +Best comic reader and comic manager with support for .cbr .cbz .zip .rar +comic files. + %prep %autosetup -p1 # wrong-file-end-of-line-encoding fix -sed -i 's/\r$//' INSTALL.md README.txt +sed -i 's/\r$//' INSTALL.md # file-not-utf8 fix -iconv -f iso8859-1 -t utf-8 README.txt > README.txt.conv && mv -f README.txt.conv README.txt +iconv -f iso8859-1 -t utf-8 README.md > README.md.conv && mv -f README.md.conv README.md + %build %qmake_qt5 %make_build + %install %make_install INSTALL_ROOT=%{buildroot} %find_lang %{name} --with-qt %find_lang %{name}library --with-qt -desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_name}.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_name}Library.desktop + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{appname}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{appname}Library.desktop + %files -f %{name}.lang -f %{name}library.lang -%doc CHANGELOG.md README.txt INSTALL.md %license COPYING.txt -%{_bindir}/%{app_name} -%{_bindir}/%{app_name}Library +%doc CHANGELOG.md README.md INSTALL.md +%{_bindir}/%{appname} +%{_bindir}/%{appname}Library +%{_bindir}/%{appname}LibraryServer %{_datadir}/%{name} -%{_datadir}/applications/%{app_name}.desktop -%{_datadir}/applications/%{app_name}Library.desktop -%{_datadir}/icons/hicolor/scalable/apps/%{app_name}.svg -%{_datadir}/icons/hicolor/scalable/apps/%{app_name}Library.svg -%{_mandir}/man1/%{app_name}.1.* -%{_mandir}/man1/%{app_name}Library.1.* +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/*/*.svg +%{_mandir}/man1/*.1.* +%{_userunitdir}/*.service + %changelog +* Mon Sep 16 2019 Artem Polishchuk - 9.6.0-1 +- Update to 9.6.0 + * Sat Jul 27 2019 Fedora Release Engineering - 9.5.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild