From c5c17cae612d2b7f9bc84134b3e5169ce80d8f7e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 7 Feb 2018 16:54:51 +0300 Subject: [PATCH] Ver. 0.9.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + ...0f02c3860f122e55029d29c75bdb9431034d.patch | 23 +++++++++++++ ...8e6947c95657dfdb0f779528260bace72a47.patch | 26 ++++++++++++++ qcomicbook.spec | 34 ++++++++++++------- sources | 2 +- 5 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 qcomicbook-123b0f02c3860f122e55029d29c75bdb9431034d.patch create mode 100644 qcomicbook-12638e6947c95657dfdb0f779528260bace72a47.patch diff --git a/.gitignore b/.gitignore index 87a9540..028bb1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qcomicbook-0.7.2.tar.gz /qcomicbook-0.9.0.tar.gz +/qcomicbook-0.9.1.tar.gz diff --git a/qcomicbook-123b0f02c3860f122e55029d29c75bdb9431034d.patch b/qcomicbook-123b0f02c3860f122e55029d29c75bdb9431034d.patch new file mode 100644 index 0000000..d09088b --- /dev/null +++ b/qcomicbook-123b0f02c3860f122e55029d29c75bdb9431034d.patch @@ -0,0 +1,23 @@ +From 123b0f02c3860f122e55029d29c75bdb9431034d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89douard=20WILLISSECK?= +Date: Mon, 17 Apr 2017 13:57:15 +0200 +Subject: [PATCH] qcomicbook.desktop: Removed .png extension to Icon. + +Icons located in /usr/share/pixmaps should not specify the extension now. +--- + data/qcomicbook.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/qcomicbook.desktop b/data/qcomicbook.desktop +index bc5eb81..f1f5725 100644 +--- a/data/qcomicbook.desktop ++++ b/data/qcomicbook.desktop +@@ -10,7 +10,7 @@ Comment[fi]=QComicBook on sarjakuva-arkistojen katselin (cbz, cbr ja cbt), jossa + Comment[tr]=QComicBook cbz, cbr, cbt biçimindeki çizgi roman arşivlerini görüntülemek için kullanılır. Sayfa ön görünümü, sayfa döşeme, yer imi, mangalar için sayfa sırasını ters gösterme gibi çizgi roman okumayı kolaylaştırıcı özellikleri bulunuyor. + Comment[pl]=Przeglądarka do archiwów z komiksami + Exec=qcomicbook %u +-Icon=qcomicbook.png ++Icon=qcomicbook + Terminal=false + Type=Application + StartupNotify=false diff --git a/qcomicbook-12638e6947c95657dfdb0f779528260bace72a47.patch b/qcomicbook-12638e6947c95657dfdb0f779528260bace72a47.patch new file mode 100644 index 0000000..38eae51 --- /dev/null +++ b/qcomicbook-12638e6947c95657dfdb0f779528260bace72a47.patch @@ -0,0 +1,26 @@ +From 12638e6947c95657dfdb0f779528260bace72a47 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89douard=20WILLISSECK?= +Date: Mon, 17 Apr 2017 13:56:59 +0200 +Subject: [PATCH] qcomicbook.desktop: Added %u to Exec property + +This will allow Nautilus to detect qcomicbook as a program to open .cbr files by default. +It simply says that the qcomicbook command can take up to one URL parameter. + +Maybe it should be %U to allow multiple URLs but I didn't see the need for it. +--- + data/qcomicbook.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/qcomicbook.desktop b/data/qcomicbook.desktop +index b9a0060..bc5eb81 100644 +--- a/data/qcomicbook.desktop ++++ b/data/qcomicbook.desktop +@@ -9,7 +9,7 @@ Comment=QComicBook is a viewer for comic book archives (cbz, cbr, cbt). QComicBo + Comment[fi]=QComicBook on sarjakuva-arkistojen katselin (cbz, cbr ja cbt), jossa on lukemista helpottavia ominaisuuksia, kuten sivujen esikatselu, pienoiskuvat, kirjanmerkit ja mangatila. + Comment[tr]=QComicBook cbz, cbr, cbt biçimindeki çizgi roman arşivlerini görüntülemek için kullanılır. Sayfa ön görünümü, sayfa döşeme, yer imi, mangalar için sayfa sırasını ters gösterme gibi çizgi roman okumayı kolaylaştırıcı özellikleri bulunuyor. + Comment[pl]=Przeglądarka do archiwów z komiksami +-Exec=qcomicbook ++Exec=qcomicbook %u + Icon=qcomicbook.png + Terminal=false + Type=Application diff --git a/qcomicbook.spec b/qcomicbook.spec index 8952d03..ce5b21e 100644 --- a/qcomicbook.spec +++ b/qcomicbook.spec @@ -1,21 +1,26 @@ Summary: A viewer for comic book archives Name: qcomicbook -Version: 0.9.0 -Release: 12%{?dist} +Version: 0.9.1 +Release: 1%{?dist} License: GPLv2 -URL: http://qcomicbook.org/ -Source0: http://qcomicbook.org/releases/qcomicbook-%{version}.tar.gz +URL: https://github.com/stolowski/QComicBook/ +Source0: https://github.com/stolowski/QComicBook/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/stolowski/QComicBook/pull/30 +Patch1: qcomicbook-12638e6947c95657dfdb0f779528260bace72a47.patch +Patch2: qcomicbook-123b0f02c3860f122e55029d29c75bdb9431034d.patch BuildRequires: cmake BuildRequires: desktop-file-utils -BuildRequires: pkgconfig(poppler-qt4) -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(poppler-qt5) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: qt5-linguist +#BuildRequires: pkgconfig(xmu) +#BuildRequires: pkgconfig(xi) -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +#%%{?_qt5_version:Requires: qt5%%{?_isa} >= %%{_qt5_version}} ## runtime utilities for viewing comic book archives #Requires: bzip2 #Requires: gzip @@ -42,7 +47,7 @@ menu option of QComicBook. %prep -%setup -q +%autosetup -p1 -n QComicBook-%{version} %build @@ -119,6 +124,11 @@ fi %changelog +* Wed Feb 07 2018 Peter Lemenkov - 0.9.1-1 +- Ver. 0.9.1 +- Switch to Qt5 +- Fix rhbz#1471770 + * Thu Aug 03 2017 Fedora Release Engineering - 0.9.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -196,13 +206,13 @@ fi * Wed Nov 07 2007 Scott Baker - 0.4.0-1 - Update to the latest version and drop the imlib dependency -* Thu Nov 11 2006 Scott Baker - 0.3.4-1 +* Thu Nov 30 2006 Scott Baker - 0.3.4-1 - Update to the latest version * Mon Oct 09 2006 Scott Baker - 0.3.3-5 - Build on FC6 -* Tue Sep 20 2006 Scott Baker - 0.3.3-2 +* Wed Sep 20 2006 Scott Baker - 0.3.3-2 - Bumped release to 0.3.3 * Sun Sep 03 2006 Scott Baker - 0.3.2-6 diff --git a/sources b/sources index eb2011c..cb3f78a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b209bfb081afd4c06eedb6bb08f957f0 qcomicbook-0.9.0.tar.gz +SHA512 (qcomicbook-0.9.1.tar.gz) = 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d