Fix F45FTBFS

Signed-off-by: Artem Polishchuk <ego.cordatus@gmail.com>

.gitignore

@@ -1 +1,19 @@
 /yacreader-9.5.0-src.tar.xz
+/yacreader-9.6.0.tar.gz
+/yacreader-9.6.2.tar.gz
+/yacreader-9.7.0.tar.gz
+/yacreader-9.7.1.tar.gz
+/yacreader-9.8.2.2106195-src.tar.xz
+/yacreader-9.9.0.2209032-src.tar.xz
+/yacreader-9.9.1.2209046-src.tar.xz
+/yacreader-9.9.2.2210021-src.tar.xz
+/yacreader-9.10.0.2210304-src.tar.xz
+/yacreader-9.11.0.2301073-src.tar.xz
+/yacreader-9.12.0.2304234-src.tar.xz
+/yacreader-9.13.0.2307095-src.tar.xz
+/yacreader-9.13.1.2307166-src.tar.xz
+/yacreader-9.14.1.2402053-src.tar.xz
+/yacreader-9.14.2.2402143-src.tar.xz
+/yacreader-9.15.0-src.tar.xz
+/yacreader-9.16.2-src.tar.xz
+/yacreader-9.16.3-src.tar.xz

0001-Fix-YACReader-build-for-Qt-5.7.patch

@@ -1,31 +0,0 @@
-From 1fbf1195b997c11509afce8d4a7322e7561ab301 Mon Sep 17 00:00:00 2001
-From: Felix Kauselmann <licorn@gmail.com>
-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
-

changelog

@@ -0,0 +1,51 @@
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Nov 26 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 9.8.2-1
+- chore(update): 9.8.2 | Co-authored-by: Jack Xu <jackyzy823@gmail.com>
+- build(add BR): libqrencode
+- build(add BR): Qt5Svg
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 9.7.1-3
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Sep 12 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 9.7.1-1
+- Update to 9.7.1
+
+* Fri Sep  4 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 9.7.0-1
+- Update to 9.7.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.6.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Feb 02 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 9.6.2-3
+- Add dep: qt5-qtgraphicaleffects
+- Add dep: qt5-qtquickcontrols
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 21 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 9.6.2-1
+- Update to 9.6.2
+- Enable LTO
+
+* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 9.6.0-2
+- Rebuild for poppler-0.84.0
+
+* Mon Sep 16 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 9.6.0-1
+- Update to 9.6.0
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.5.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 29 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 9.5.0-6
+- Initial package.

sources

@@ -1 +1 @@
-SHA512 (yacreader-9.5.0-src.tar.xz) = 6cd3b12b6f5ee7197fb3ac6e81f447678395c1dfffb562f133051825921f3056f3a439761fd8d6311e6af91c42a1004b88c79f8b9ed7dec190bd0a4eb9554f51
+SHA512 (yacreader-9.16.3-src.tar.xz) = 837c66d8a269e204561ac61d5749610682755876be2b70e4f669f54246c55296704ae197760eeaa1ef537abe5395673fbd700d1d2103e07cedd1beeecf31b659

yacreader.spec

@@ -1,66 +1,93 @@
-%global app_name YACReader
+%global appname YACReader
+%global versuf %{nil}
 
 Name:           yacreader
-Version:        9.5.0
-Release:        6%{?dist}
+Version:        9.16.3
+Release:        %autorelease
 Summary:        Cross platform comic reader and library manager
 
-# The entire source code is GPLv3+ except:
-# BSD:          QsLog
+# The entire source code is GPL-3.0-or-later except:
+# BSD-3-Clause: QsLog
 #               folder_model
 # MIT:          pictureflow
-License:        GPLv3+ and BSD and MIT
+License:        GPL-3.0-or-later AND BSD-3-Clause 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}/releases/download/%{version}/%{name}-%{version}%{versuf}-src.tar.xz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
+BuildRequires:  make
+BuildRequires:  cmake
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  pkgconfig(Qt5)
-BuildRequires:  pkgconfig(Qt5Multimedia)
-BuildRequires:  pkgconfig(Qt5ScriptTools)
+BuildRequires:  systemd-rpm-macros
+
+BuildRequires:  cmake(Qt5)
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  cmake(Qt5Multimedia)
+BuildRequires:  cmake(Qt5QuickControls2)
+BuildRequires:  cmake(Qt5ScriptTools)
+BuildRequires:  cmake(Qt5Svg)
+
+# For YACReaderLibrary QR Code display
+BuildRequires:  pkgconfig(libqrencode)
+
 BuildRequires:  pkgconfig(libunarr)
 BuildRequires:  pkgconfig(poppler-qt5)
 
 Requires:       hicolor-icon-theme
+Requires:       qt5-qtgraphicaleffects%{?_isa}
+Requires:       qt5-qtquickcontrols%{?_isa}
+Requires:       qt5-qtsvg
 
 %description
-Best comic reader and comic manager with support for .cbr .cbz .zip .rar comic
-files.
+"Yet another comic reader".
+
 
 %prep
-%autosetup -p1
+%autosetup -n %{name}-%{version}%{versuf}
+
 # 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
+# Translations
+lrelease-qt5 %{appname}/%{appname}.pro
+lrelease-qt5 %{appname}Library/%{appname}Library.pro
+
 %qmake_qt5
 %make_build
 
+
 %install
-%make_install INSTALL_ROOT=%{buildroot}
+%make_install \
+    INSTALL_ROOT=%{buildroot}
+# Translations
+mkdir -p %{buildroot}%{_datadir}/%{name}/languages
+find . -name \*.qm -exec cp {} %{buildroot}%{_datadir}/%{name}/languages/ \;
 %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/*.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
-%{_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.*
+%doc CHANGELOG.md README.md INSTALL.md
+%{_bindir}/%{appname}
+%{_bindir}/%{appname}Library
+%{_bindir}/%{appname}LibraryServer
+%{_datadir}/%{name}/server/
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*.svg
+%{_mandir}/man1/*.1*
+%{_userunitdir}/*.service
+%dir %{_datadir}/%{name}/
+
 
 %changelog
-* Fri Mar 29 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 9.5.0-6
-- Initial package.
+%autochangelog