From c9ba6589caa9ca14a0d9aab175d754734da03998 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:31:40 +0000 Subject: [PATCH 01/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 95c51a0..abbb22d 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -8,7 +8,7 @@ Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.8.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.9.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -148,6 +148,9 @@ desktop-file-install \ # TODO: appdata file, not availale yet (should item) %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0-0.9.D20191205gita098f81 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0-0.8.D20191205gita098f81 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f8988caa57fde75accd85bbfe339a7401927a7bd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Feb 2021 00:41:27 +0900 Subject: [PATCH 02/42] Update to the latest git --- .gitignore | 1 + ...exception-when-loading-bookmark-pick.patch | 36 ------------------- ...tocol-version-for-mcomix-compatibili.patch | 29 --------------- mcomix3.spec | 23 ++++++------ sources | 2 +- 5 files changed, 12 insertions(+), 79 deletions(-) delete mode 100644 0001-Handle-encoding-exception-when-loading-bookmark-pick.patch delete mode 100644 0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch diff --git a/.gitignore b/.gitignore index a04c04f..3724b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /mcomix3-20190915T1557.tar.bz2 /mcomix3-20191230T1643.tar.bz2 +/mcomix3-20210221T1251.tar.bz2 diff --git a/0001-Handle-encoding-exception-when-loading-bookmark-pick.patch b/0001-Handle-encoding-exception-when-loading-bookmark-pick.patch deleted file mode 100644 index b4801e9..0000000 --- a/0001-Handle-encoding-exception-when-loading-bookmark-pick.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 42db2659bf09478e063cce3444d1cfa392f9b7aa Mon Sep 17 00:00:00 2001 -From: mcomix3 Fedora maintainer -Date: Mon, 4 Nov 2019 14:07:16 +0900 -Subject: [PATCH] Handle encoding exception when loading bookmark pickle from - mcomix - -When loading bookmark pickle from mcomix, some exception may happen: - - File "mcomix/mcomix/bookmark_backend.py", line 148, in load_bookmarks - packs = pickle.load(fd) -UnicodeDecodeError: 'ascii' codec can't decode byte 0xe1 in position 1: ordinal not in range(128) - -This patch avoids this. ---- - mcomix/mcomix/bookmark_backend.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/mcomix/mcomix/bookmark_backend.py b/mcomix/mcomix/bookmark_backend.py -index 0492600..d1080be 100644 ---- a/mcomix/mcomix/bookmark_backend.py -+++ b/mcomix/mcomix/bookmark_backend.py -@@ -142,7 +142,10 @@ class __BookmarksStore(object): - mtime = os.stat(path).st_mtime - with open(path, 'rb') as fd: - version = pickle.load(fd) -- packs = pickle.load(fd) -+ try: -+ packs = pickle.load(fd) -+ except UnicodeDecodeError: -+ packs = pickle.load(fd, encoding='latin1') - - for pack in packs: - # Handle old bookmarks without date_added attribute --- -2.23.0 - diff --git a/0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch b/0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch deleted file mode 100644 index 46fdfb4..0000000 --- a/0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8df033bd3e2c267a21c9a646c811470d5880f1a3 Mon Sep 17 00:00:00 2001 -From: mcomix3 Fedora maintainer -Date: Mon, 4 Nov 2019 16:10:09 +0900 -Subject: [PATCH] Lower pickle protocol version for mcomix compatibility - ---- - mcomix/mcomix/bookmark_backend.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mcomix/mcomix/bookmark_backend.py b/mcomix/mcomix/bookmark_backend.py -index d1080be..1ae4d2a 100644 ---- a/mcomix/mcomix/bookmark_backend.py -+++ b/mcomix/mcomix/bookmark_backend.py -@@ -187,10 +187,10 @@ class __BookmarksStore(object): - self._bookmarks = list(set(self._bookmarks + new_bookmarks)) - - with open(constants.BOOKMARK_PICKLE_PATH, 'wb') as fd: -- pickle.dump(constants.VERSION, fd, pickle.HIGHEST_PROTOCOL) -+ pickle.dump(constants.VERSION, fd, 2) - - packs = [bookmark.pack() for bookmark in self._bookmarks] -- pickle.dump(packs, fd, pickle.HIGHEST_PROTOCOL) -+ pickle.dump(packs, fd, 2) - - self._bookmarks_mtime = time.time() - --- -2.23.0 - diff --git a/mcomix3.spec b/mcomix3.spec index abbb22d..514006f 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit a098f817272443a22ddd80d40b9eb00a0ed429c9 -%global gitdate 20191205 +%global gitcommit 9ba2f5be14ad925605b2c8fa7b9933799f08ef58 +%global gitdate 20201223 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20191230 -%global tarballtime 1643 +%global tarballdate 20210221 +%global tarballtime 1251 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.9.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.10.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -24,10 +24,8 @@ Source2: mcomix3starter.sh # Borrow some desktop related files Source10: mcomix3.desktop # Patches -Patch1: 0001-Handle-encoding-exception-when-loading-bookmark-pick.patch Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch -Patch4: 0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch BuildRequires: python3-devel #BuildRequires: %%{_bindir}/appstream-util @@ -38,11 +36,10 @@ Requires: gtk3 Requires: python3-gobject Requires: python3-pillow BuildArch: noarch -%if 0%{?fedora} >= 32 + Obsoletes: mcomix < 1.2.2 Obsoletes: comix < 4.0.5 Provides: mcomix = 1.2.2 -%endif %description @@ -61,11 +58,8 @@ git config user.email "%{name}-owner@fedoraproject.org" git checkout -b %{version}-%{release}-fedora %{gitcommit} # Apply patches -cat %{PATCH1} | git am cat %{PATCH2} | git am cat %{PATCH3} | git am -# For now apply this -cat %{PATCH4} | git am %build pushd %{name} @@ -124,7 +118,7 @@ rmdir localroot.2 popd # Wrapper symlink mkdir %{buildroot}/%{_bindir} -ln -sf ${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3 +ln -sf ../../${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3 # Desktop file mkdir %{buildroot}%{_datadir}/applications desktop-file-install \ @@ -148,6 +142,9 @@ desktop-file-install \ # TODO: appdata file, not availale yet (should item) %changelog +* Mon Feb 22 2021 Mamoru TASAKA 0-0.10.D20201223git9ba2f5b +- Update to the latest git + * Tue Jan 26 2021 Fedora Release Engineering - 0-0.9.D20191205gita098f81 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e767fe7..ce1059f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20191230T1643.tar.bz2) = af2b43c92e66b5322f57c3cfa4dfc6d387f221c4660bca77bc0d6f0187bee8b81602909edff001e8832953d0eb082202104200c2e84c75cfba9bd5909cdde993 +SHA512 (mcomix3-20210221T1251.tar.bz2) = ffa1e78fd0ed6d30d3fb629b1370be027baaeb90d846730811f4e4e5cea09363d74b5cac8a647ec68b417cb75f399e52ae30b18d33105e9649561bf5c677f543 From b89be89fe1c1d075de1cd6753b697e13b0d7fc85 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 9 Mar 2021 20:21:07 +0900 Subject: [PATCH 03/42] Install mime related files and comicthumb --- mcomix3.spec | 83 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 15 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index 514006f..f478db4 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -8,7 +8,7 @@ Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.10.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.10.100.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -21,14 +21,12 @@ Source0: %{name}-%{tarballdate}T%{tarballtime}.tar.bz2 Source1: create-mcomix3-git-bare-tarball.sh # Some additional files Source2: mcomix3starter.sh -# Borrow some desktop related files -Source10: mcomix3.desktop # Patches Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch BuildRequires: python3-devel -#BuildRequires: %%{_bindir}/appstream-util +BuildRequires: %{_bindir}/appstream-util BuildRequires: %{_bindir}/desktop-file-install BuildRequires: gettext BuildRequires: git @@ -67,12 +65,26 @@ rm -rf localroot mkdir localroot python3 installer.py --srcdir=mcomix --target=$(pwd)/localroot/ + +# mime +pushd mime +cat mcomix.appdata.xml | \ + sed -e 's|omix|omix3|' | sed -e 's|/mcomix3/|/mcomix/|' \ + > %{name}.appdata.xml +cat mcomix.desktop | sed -e 's|omix|omix3|' > %{name}.desktop +popd + +# man +pushd man +cat mcomix.1 | sed -e 's|omix|omix3|' > %{name}.1 +popd + popd %install pushd %{name} cp -p [A-Z]* .. -popd +popd # from %%name # Install manually... SITETOPDIR=%{python3_sitelib}/%{name} @@ -97,6 +109,7 @@ do mv $f $dir/%{name}.mo done mv mcomix/messages/* %{buildroot}%{_datadir}/locale/ + # duplicate icon for dir in mcomix/images/*x*/ do @@ -104,30 +117,58 @@ do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$basedir/apps cp -p $dir/*png %{buildroot}%{_datadir}/icons/hicolor/$basedir/apps/%{name}.png done -# data files -mv mcomix/ ${DSTTOPDIR}/mcomix3/ -# Not needed -rm -f comicthumb.py + +# scripts +mv comicthumb.py ${DSTTOPDIR}/ mv mcomixstarter.py ${DSTTOPDIR}/ +# data files +mv mcomix/ ${DSTTOPDIR}/mcomix3/ + # Ensure that all files are installed -popd +popd # from localroot.2/mcomix rmdir localroot.2/mcomix rmdir localroot.2 -popd +popd # from %%name # Wrapper symlink mkdir %{buildroot}/%{_bindir} ln -sf ../../${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3 -# Desktop file -mkdir %{buildroot}%{_datadir}/applications +ln -sf ../../${SITETOPDIR}/comicthumb.py %{buildroot}%{_bindir}/comicthumb + +pushd %{name} +# mime data +pushd mime +install -D -cpm 0644 comicthumb.thumbnailer %{buildroot}%{_datadir}/thumbnailers/comicthumb.thumbnailer +install -D -cpm 0644 %{name}.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml + +## desktop file +mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --remove-category Application \ --dir %{buildroot}%{_datadir}/applications/ \ - %{SOURCE10} + ./%{name}.desktop + +## Not installing mimetype icon files for now +popd # from mime + +# man +pushd man +mkdir -p %{buildroot}%{_mandir}/man1 +install -cpm 0644 \ + comicthumb.1 \ + %{name}.1 \ + %{buildroot}%{_mandir}/man1/ +popd # from man + +popd # from %%name %find_lang %{name} +%check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml + + %files -f %{name}.lang %license COPYING %doc ChangeLog @@ -135,13 +176,25 @@ desktop-file-install \ %doc TODO %{_bindir}/%{name} +%{_bindir}/comicthumb + %{python3_sitelib}/%{name}/ + # Do not own %%{_datadir}/icons/hicolor explicitly %{_datadir}/icons/hicolor/*/apps/%{name}.png + +%{_datadir}/thumbnailers/comicthumb.thumbnailer +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -# TODO: appdata file, not availale yet (should item) + +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/comicthumb.1* + %changelog +* Tue Mar 9 2021 Mamoru TASAKA +- Install mime related files and comicthumb + * Mon Feb 22 2021 Mamoru TASAKA 0-0.10.D20201223git9ba2f5b - Update to the latest git From 519361ae0e730291c9fd88fbb074ea31007e7c9e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 9 Mar 2021 20:43:15 +0900 Subject: [PATCH 04/42] Update to the latest git --- .gitignore | 1 + create-mcomix3-git-bare-tarball.sh | 2 +- mcomix3.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3724b5a..7434dde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mcomix3-20190915T1557.tar.bz2 /mcomix3-20191230T1643.tar.bz2 /mcomix3-20210221T1251.tar.bz2 +/mcomix3-20210309T2023.tar.bz2 diff --git a/create-mcomix3-git-bare-tarball.sh b/create-mcomix3-git-bare-tarball.sh index e00c04c..a5135e6 100644 --- a/create-mcomix3-git-bare-tarball.sh +++ b/create-mcomix3-git-bare-tarball.sh @@ -21,7 +21,7 @@ mkdir TMP pushd TMP git clone ../${REPONAME}.git cd ${REPONAME} -git log 2>&1 | head -n 3 +git log --format=fuller | head -n 12 echo popd diff --git a/mcomix3.spec b/mcomix3.spec index f478db4..51f619a 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit 9ba2f5be14ad925605b2c8fa7b9933799f08ef58 -%global gitdate 20201223 +%global gitcommit e5f39a2b817c48207c5a60f367d746aaa1e34f3e +%global gitdate 20210226 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210221 -%global tarballtime 1251 +%global tarballdate 20210309 +%global tarballtime 2023 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.10.100.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.11.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -192,10 +192,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Mar 9 2021 Mamoru TASAKA - 0-0.11.D20210226gite5f39a2 +- Update to the latest git + * Tue Mar 9 2021 Mamoru TASAKA - Install mime related files and comicthumb -* Mon Feb 22 2021 Mamoru TASAKA 0-0.10.D20201223git9ba2f5b +* Mon Feb 22 2021 Mamoru TASAKA - 0-0.10.D20201223git9ba2f5b - Update to the latest git * Tue Jan 26 2021 Fedora Release Engineering - 0-0.9.D20191205gita098f81 diff --git a/sources b/sources index ce1059f..857f45b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210221T1251.tar.bz2) = ffa1e78fd0ed6d30d3fb629b1370be027baaeb90d846730811f4e4e5cea09363d74b5cac8a647ec68b417cb75f399e52ae30b18d33105e9649561bf5c677f543 +SHA512 (mcomix3-20210309T2023.tar.bz2) = b52a23460a554377b97846fb4471c3f8b339a4c127d51c99be63e7421cf1f6d78515ff4ac80da322b3933e7c32e8cd010808fe7187b14f02b9e35ae728deaec1 From 1084f6f5462d7895e24debc74f19b33b4f3061f8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Mar 2021 14:57:10 +0900 Subject: [PATCH 05/42] update to the latest git --- mcomix3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index 51f619a..a697a11 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,9 +1,9 @@ -%global gitcommit e5f39a2b817c48207c5a60f367d746aaa1e34f3e -%global gitdate 20210226 +%global gitcommit dfe9520bb895cfa756d892b037519ca48f537499 +%global gitdate 20210321 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210309 -%global tarballtime 2023 +%global tarballdate 20210326 +%global tarballtime 1416 Name: mcomix3 # For now, choose version 0 @@ -192,6 +192,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Mar 26 2021 Mamoru TASAKA +- Update to the latest git + * Tue Mar 9 2021 Mamoru TASAKA - 0-0.11.D20210226gite5f39a2 - Update to the latest git From d2c5c9636a99828d7808e432d07cc323da767d2f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Mar 2021 22:45:03 +0900 Subject: [PATCH 06/42] move script --- mcomix3starter.sh => mcomix3starter.sh.in | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mcomix3starter.sh => mcomix3starter.sh.in (100%) diff --git a/mcomix3starter.sh b/mcomix3starter.sh.in similarity index 100% rename from mcomix3starter.sh rename to mcomix3starter.sh.in From 064bcb97126809116b48f14378fb67b39aff3c15 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Mar 2021 23:19:04 +0900 Subject: [PATCH 07/42] Apply bug 1941827 suggestion --- mcomix3.spec | 25 ++++++++++++++++++++----- mcomix3starter.sh.in | 10 +++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index a697a11..1f9bf10 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -8,7 +8,7 @@ Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.11.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.12.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -20,7 +20,7 @@ Source0: %{name}-%{tarballdate}T%{tarballtime}.tar.bz2 # Source0 is created by Source1 Source1: create-mcomix3-git-bare-tarball.sh # Some additional files -Source2: mcomix3starter.sh +Source2: mcomix3starter.sh.in # Patches Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch @@ -81,7 +81,14 @@ popd popd +# starter script +cat %SOURCE2 | sed -e 's|@python3_sitelib@|%python3_sitelib|g' > mcomix3starter.sh +# create starter script for comicthumb +cat mcomix3starter.sh | sed -e 's|mcomixstarter|comicthumb|' > comicthumbstarter.sh + %install +BUILDTOPDIR=$(pwd) + pushd %{name} cp -p [A-Z]* .. popd # from %%name @@ -101,7 +108,8 @@ cp -a localroot localroot.2 pushd localroot.2/mcomix # Wrapper script -install -cpm 0755 %{SOURCE2} ${DSTTOPDIR} +install -cpm 0755 ${BUILDTOPDIR}/mcomix3starter.sh ${DSTTOPDIR} +install -cpm 0755 ${BUILDTOPDIR}/comicthumbstarter.sh ${DSTTOPDIR} # locale files find mcomix/messages/* -type f | while read f do @@ -134,7 +142,7 @@ popd # from %%name # Wrapper symlink mkdir %{buildroot}/%{_bindir} ln -sf ../../${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3 -ln -sf ../../${SITETOPDIR}/comicthumb.py %{buildroot}%{_bindir}/comicthumb +ln -sf ../../${SITETOPDIR}/comicthumbstarter.sh %{buildroot}%{_bindir}/comicthumb pushd %{name} # mime data @@ -192,8 +200,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sun Mar 28 2021 Mamoru TASAKA 0-0.12.D20210321gitdfe9520 +- Apply bug 1941827 suggestion + * Fri Mar 26 2021 Mamoru TASAKA -- Update to the latest git +- Update to the latest git (20210321gitdfe9520) + +* Tue Mar 23 2021 Mikhail Novosyolov +- Simply mcomix3 starter script (bug 1941827) +- Also create starter script for comicthumb (bug 1941827) * Tue Mar 9 2021 Mamoru TASAKA - 0-0.11.D20210226gite5f39a2 - Update to the latest git diff --git a/mcomix3starter.sh.in b/mcomix3starter.sh.in index 5c158d3..7a442ad 100644 --- a/mcomix3starter.sh.in +++ b/mcomix3starter.sh.in @@ -1,8 +1,4 @@ -#!/usr/bin/bash +#!/bin/sh +export PYTHONPATH=@python3_sitelib@/mcomix3/mcomix3 +exec @python3_sitelib@/mcomix3/mcomixstarter.py "$*" -SCRIPTPATH="${BASH_SOURCE[0]}" -ABSPATH="$(readlink $SCRIPTPATH)" -SCRIPTDIR=$(cd $(dirname $ABSPATH); pwd) -export PYTHONPATH=${SCRIPTDIR}/mcomix3 - -exec $SCRIPTDIR/mcomixstarter.py "$@" From 61aed3535c6cbbd4ad972f17cb48ba890447ba8d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Mar 2021 23:20:06 +0900 Subject: [PATCH 08/42] update source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7434dde..3c87fd1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /mcomix3-20191230T1643.tar.bz2 /mcomix3-20210221T1251.tar.bz2 /mcomix3-20210309T2023.tar.bz2 +/mcomix3-20210326T1416.tar.bz2 diff --git a/sources b/sources index 857f45b..7abc943 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210309T2023.tar.bz2) = b52a23460a554377b97846fb4471c3f8b339a4c127d51c99be63e7421cf1f6d78515ff4ac80da322b3933e7c32e8cd010808fe7187b14f02b9e35ae728deaec1 +SHA512 (mcomix3-20210326T1416.tar.bz2) = d86c9767364944c64fc9016d34e2622da250609829cb62a6a28b45e3bb01fde01a479739e7fc3345480c5ff8770535239ec2ee81fecb0e6788a396afcedb3682 From 715d42c5e18878dc77fd0f3b4192a55e3295e74c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Apr 2021 15:14:33 +0900 Subject: [PATCH 09/42] Update to the latest git --- .gitignore | 1 + mcomix3.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3c87fd1..1f6bb5e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /mcomix3-20210221T1251.tar.bz2 /mcomix3-20210309T2023.tar.bz2 /mcomix3-20210326T1416.tar.bz2 +/mcomix3-20210401T1125.tar.bz2 diff --git a/mcomix3.spec b/mcomix3.spec index 1f9bf10..d70dbbf 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit dfe9520bb895cfa756d892b037519ca48f537499 -%global gitdate 20210321 +%global gitcommit 523f08f5f8b593580aa43479822ad239fd146486 +%global gitdate 20210329 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210326 -%global tarballtime 1416 +%global tarballdate 20210401 +%global tarballtime 1125 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.12.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.13.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,7 +200,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog -* Sun Mar 28 2021 Mamoru TASAKA 0-0.12.D20210321gitdfe9520 +* Thu Apr 1 2021 Mamoru TASAKA - 0-0.13.D20210329git523f08f +- Update to the latest git + +* Sun Mar 28 2021 Mamoru TASAKA - 0-0.12.D20210321gitdfe9520 - Apply bug 1941827 suggestion * Fri Mar 26 2021 Mamoru TASAKA diff --git a/sources b/sources index 7abc943..c9f8449 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210326T1416.tar.bz2) = d86c9767364944c64fc9016d34e2622da250609829cb62a6a28b45e3bb01fde01a479739e7fc3345480c5ff8770535239ec2ee81fecb0e6788a396afcedb3682 +SHA512 (mcomix3-20210401T1125.tar.bz2) = 64bb1f3d652d64747abdba64b5225633049ea4f9ecc3dfa16500cb004428680402ce97b70a789d0b151d81a5fe87aa5b9e49bc6e7e0e629089b0447041e188f0 From ce574bbcfe76d7107054ffe23b43ebba064ded86 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 1 May 2021 15:32:01 +0900 Subject: [PATCH 10/42] Update to the latest git --- .gitignore | 1 + mcomix3.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1f6bb5e..ec97463 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mcomix3-20210309T2023.tar.bz2 /mcomix3-20210326T1416.tar.bz2 /mcomix3-20210401T1125.tar.bz2 +/mcomix3-20210501T1509.tar.bz2 diff --git a/mcomix3.spec b/mcomix3.spec index d70dbbf..2e0d753 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit 523f08f5f8b593580aa43479822ad239fd146486 -%global gitdate 20210329 +%global gitcommit 139344e23898c28484328fc29fd0c6659affb12d +%global gitdate 20210423 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210401 -%global tarballtime 1125 +%global tarballdate 20210501 +%global tarballtime 1509 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.13.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.14.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sat May 1 2021 Mamoru TASAKA - 0-0.14.D20210423git139344e +- Update to the latest git + * Thu Apr 1 2021 Mamoru TASAKA - 0-0.13.D20210329git523f08f - Update to the latest git diff --git a/sources b/sources index c9f8449..a9fa0cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210401T1125.tar.bz2) = 64bb1f3d652d64747abdba64b5225633049ea4f9ecc3dfa16500cb004428680402ce97b70a789d0b151d81a5fe87aa5b9e49bc6e7e0e629089b0447041e188f0 +SHA512 (mcomix3-20210501T1509.tar.bz2) = 492650c38ff2fd6a55a8b6f5c075b5121b843844bb61c88a92ec27487985529f17128b0a041962dc5e19d26f274d413cd2b1d867f51b109e086fbaab0cd9bf08 From 1b4266ea4937726684ed42f9e7ad53772f9a46de Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 7 May 2021 22:57:52 +0900 Subject: [PATCH 11/42] Update to the latest git --- .gitignore | 1 + 0002-Change-domain-name-for-gettext.patch | 2 +- mcomix3.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ec97463..8dbbfc5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /mcomix3-20210326T1416.tar.bz2 /mcomix3-20210401T1125.tar.bz2 /mcomix3-20210501T1509.tar.bz2 +/mcomix3-20210507T1743.tar.bz2 diff --git a/0002-Change-domain-name-for-gettext.patch b/0002-Change-domain-name-for-gettext.patch index b0f1c54..71e574e 100644 --- a/0002-Change-domain-name-for-gettext.patch +++ b/0002-Change-domain-name-for-gettext.patch @@ -20,7 +20,7 @@ index a71588e..19c3eff 100644 +APPNAME_DOMAIN = 'mcomix3' VERSION = '1.3.0.dev0' - REQUIRED_PIL_VERSION = '5.1.0' + REQUIRED_PYTHON_VERSION = (3, 6, 0) diff --git a/mcomix/mcomix/i18n.py b/mcomix/mcomix/i18n.py index 5d067db..96a209c 100644 --- a/mcomix/mcomix/i18n.py diff --git a/mcomix3.spec b/mcomix3.spec index 2e0d753..62f4d65 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit 139344e23898c28484328fc29fd0c6659affb12d -%global gitdate 20210423 +%global gitcommit af858a641fc59f2d96e5ef6561d93877d3d8b197 +%global gitdate 20210507 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210501 -%global tarballtime 1509 +%global tarballdate 20210507 +%global tarballtime 1743 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.14.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.15.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri May 7 2021 Mamoru TASAKA - 0-0.15.D20210507gitaf858a6 +- Update to the latest git + * Sat May 1 2021 Mamoru TASAKA - 0-0.14.D20210423git139344e - Update to the latest git diff --git a/sources b/sources index a9fa0cd..6196c6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210501T1509.tar.bz2) = 492650c38ff2fd6a55a8b6f5c075b5121b843844bb61c88a92ec27487985529f17128b0a041962dc5e19d26f274d413cd2b1d867f51b109e086fbaab0cd9bf08 +SHA512 (mcomix3-20210507T1743.tar.bz2) = e1aabd43b7675a1ad51bcdc761e601c7adbe094d7da2f829efaad7f06e9224d5a3895b908988035ee7e9c70aae8e1373e632f57b9a0edf50997d587ed0ad462d From 984ae9a743898fd6755f997ad645a7366ed76e34 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:11:22 +0200 Subject: [PATCH 12/42] Rebuilt for Python 3.10 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 62f4d65..232c9e8 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -8,7 +8,7 @@ Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.15.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.16.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jun 04 2021 Python Maint - 0-0.16.D20210507gitaf858a6 +- Rebuilt for Python 3.10 + * Fri May 7 2021 Mamoru TASAKA - 0-0.15.D20210507gitaf858a6 - Update to the latest git From 609f1ac14a0d9fa3c526fa77eb661e51d1a31ed3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:01:16 +0000 Subject: [PATCH 13/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 232c9e8..9aeed42 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -8,7 +8,7 @@ Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.16.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.17.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0-0.17.D20210507gitaf858a6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0-0.16.D20210507gitaf858a6 - Rebuilt for Python 3.10 From a041f78cf9a05c14c00d683b68e52d38d81509ce Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 30 Jul 2021 14:42:01 +0900 Subject: [PATCH 14/42] Update to the latest git --- .gitignore | 1 + 0002-Change-domain-name-for-gettext.patch | 2 +- mcomix3.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8dbbfc5..577b7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /mcomix3-20210401T1125.tar.bz2 /mcomix3-20210501T1509.tar.bz2 /mcomix3-20210507T1743.tar.bz2 +/mcomix3-20210730T1400.tar.bz2 diff --git a/0002-Change-domain-name-for-gettext.patch b/0002-Change-domain-name-for-gettext.patch index 71e574e..262158b 100644 --- a/0002-Change-domain-name-for-gettext.patch +++ b/0002-Change-domain-name-for-gettext.patch @@ -20,7 +20,7 @@ index a71588e..19c3eff 100644 +APPNAME_DOMAIN = 'mcomix3' VERSION = '1.3.0.dev0' - REQUIRED_PYTHON_VERSION = (3, 6, 0) + REQUIRED_PYTHON_VERSION = (3, 8, 0) diff --git a/mcomix/mcomix/i18n.py b/mcomix/mcomix/i18n.py index 5d067db..96a209c 100644 --- a/mcomix/mcomix/i18n.py diff --git a/mcomix3.spec b/mcomix3.spec index 9aeed42..7089207 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit af858a641fc59f2d96e5ef6561d93877d3d8b197 -%global gitdate 20210507 +%global gitcommit 9eb4fc7bcae40af9171d9d4e22ac1ebbd38d8d99 +%global gitdate 20210526 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210507 -%global tarballtime 1743 +%global tarballdate 20210730 +%global tarballtime 1400 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.17.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.18.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jul 30 2021 Mamoru TASAKA - 0-0.18.D20210526git9eb4fc7 +- Update to the latest git + * Thu Jul 22 2021 Fedora Release Engineering - 0-0.17.D20210507gitaf858a6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 6196c6a..6da1098 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210507T1743.tar.bz2) = e1aabd43b7675a1ad51bcdc761e601c7adbe094d7da2f829efaad7f06e9224d5a3895b908988035ee7e9c70aae8e1373e632f57b9a0edf50997d587ed0ad462d +SHA512 (mcomix3-20210730T1400.tar.bz2) = 220419e104238458af7fce944a4a299e4bc7d154388587d9a987ae59209bcb7f222ee9b0ad2e378b782cb5c033deffb2b257f7e5a54fdd064f79548bdd30bcf2 From 7d81fab78cf6ffa865296320eeb1859612303821 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Aug 2021 23:16:27 +0900 Subject: [PATCH 15/42] Update to the latest git --- .gitignore | 1 + mcomix3.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 577b7eb..93b3d7f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /mcomix3-20210501T1509.tar.bz2 /mcomix3-20210507T1743.tar.bz2 /mcomix3-20210730T1400.tar.bz2 +/mcomix3-20210810T1753.tar.bz2 diff --git a/mcomix3.spec b/mcomix3.spec index 7089207..c3fbce4 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,14 +1,14 @@ -%global gitcommit 9eb4fc7bcae40af9171d9d4e22ac1ebbd38d8d99 -%global gitdate 20210526 +%global gitcommit d003e64c2559a238e59f4f9eb4ec2a60dad5ac6f +%global gitdate 20210803 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210730 -%global tarballtime 1400 +%global tarballdate 20210810 +%global tarballtime 1753 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.18.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.19.D%{gitdate}git%{shortcommit}%{?dist} Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Aug 10 2021 Mamoru TASAKA - 0-0.19.D20210803gitd003e64 +- Update to the latest git + * Fri Jul 30 2021 Mamoru TASAKA - 0-0.18.D20210526git9eb4fc7 - Update to the latest git diff --git a/sources b/sources index 6da1098..f700e3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210730T1400.tar.bz2) = 220419e104238458af7fce944a4a299e4bc7d154388587d9a987ae59209bcb7f222ee9b0ad2e378b782cb5c033deffb2b257f7e5a54fdd064f79548bdd30bcf2 +SHA512 (mcomix3-20210810T1753.tar.bz2) = 5f1d3b2a1a11c4d93228ff03b73f7dd2240c6685acd9c2d205658de42eb00187d85a50d54eeb79a843e70e49c24e78db519cfe461094197f0085b06a50832c09 From 4ac17556c55eb6b6ec090065e15cbd84a877d967 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Sep 2021 15:44:19 +0900 Subject: [PATCH 16/42] Update to the latest git --- mcomix3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index c3fbce4..759342d 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,9 +1,9 @@ -%global gitcommit d003e64c2559a238e59f4f9eb4ec2a60dad5ac6f -%global gitdate 20210803 +%global gitcommit 8cd3ebe290a9f05469045ef09ab85e06be5103bd +%global gitdate 20210829 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210810 -%global tarballtime 1753 +%global tarballdate 20210912 +%global tarballtime 1529 Name: mcomix3 # For now, choose version 0 @@ -200,6 +200,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sun Sep 12 2021 Mamoru TASAKA - 0-0.20.D20210829git8cd3ebe +- Update to the latest git + * Tue Aug 10 2021 Mamoru TASAKA - 0-0.19.D20210803gitd003e64 - Update to the latest git From 481bf7030868fb7f7f637734cab6adeb2dc43736 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Sep 2021 16:17:36 +0900 Subject: [PATCH 17/42] Split whole package into -base and -thumbnailer (ref: bug 1965831) --- mcomix3.spec | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index 759342d..9be03fb 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -5,11 +5,18 @@ %global tarballdate 20210912 %global tarballtime 1529 +%global base_summary User-friendly, customizable image viewer for comic books + +%global base_description \ +MComix3 is a user-friendly, customizable image viewer. \ +It has been forked from the original MComix project and ported to python3. + + Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.19.D%{gitdate}git%{shortcommit}%{?dist} -Summary: User-friendly, customizable image viewer for comic books +Release: 0.20.D%{gitdate}git%{shortcommit}%{?dist} +Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ URL: https://github.com/multiSnow/mcomix3 @@ -30,10 +37,9 @@ BuildRequires: %{_bindir}/appstream-util BuildRequires: %{_bindir}/desktop-file-install BuildRequires: gettext BuildRequires: git -Requires: gtk3 -Requires: python3-gobject -Requires: python3-pillow BuildArch: noarch +Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-thumbnailer = %{version}-%{release} Obsoletes: mcomix < 1.2.2 Obsoletes: comix < 4.0.5 @@ -41,8 +47,24 @@ Provides: mcomix = 1.2.2 %description -MComix3 is a user-friendly, customizable image viewer. -It has been forked from the original MComix project and ported to python3. +%base_description + +%package base +Summary: %base_summary +Requires: gtk3 +Requires: python3-gobject +Requires: python3-pillow + +%description base +%base_description +This package contains base executable %{name} script. + +%package thumbnailer +Summary: Thumbnailer for %{name} +Requires: %{name}-base = %{version}-%{release} + +%description thumbnailer +This package contains thumbnailer for %{name}. %prep %setup -q -c -T -a 0 @@ -176,32 +198,36 @@ popd # from %%name %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml +%files -%files -f %{name}.lang +%files base -f %{name}.lang %license COPYING %doc ChangeLog %doc README* %doc TODO %{_bindir}/%{name} -%{_bindir}/comicthumb %{python3_sitelib}/%{name}/ # Do not own %%{_datadir}/icons/hicolor explicitly %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/thumbnailers/comicthumb.thumbnailer %{_metainfodir}/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/%{name}.1* + +%files thumbnailer +%{_bindir}/comicthumb +%{_datadir}/thumbnailers/comicthumb.thumbnailer %{_mandir}/man1/comicthumb.1* %changelog * Sun Sep 12 2021 Mamoru TASAKA - 0-0.20.D20210829git8cd3ebe - Update to the latest git +- Split whole package into -base and -thumbnailer (ref: bug 1965831) * Tue Aug 10 2021 Mamoru TASAKA - 0-0.19.D20210803gitd003e64 - Update to the latest git From dfce1322aec076f9a282e65ac47f1de649659fba Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 12 Sep 2021 16:20:03 +0900 Subject: [PATCH 18/42] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 93b3d7f..4452852 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /mcomix3-20210507T1743.tar.bz2 /mcomix3-20210730T1400.tar.bz2 /mcomix3-20210810T1753.tar.bz2 +/mcomix3-20210912T1529.tar.bz2 diff --git a/sources b/sources index f700e3e..3ac1230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210810T1753.tar.bz2) = 5f1d3b2a1a11c4d93228ff03b73f7dd2240c6685acd9c2d205658de42eb00187d85a50d54eeb79a843e70e49c24e78db519cfe461094197f0085b06a50832c09 +SHA512 (mcomix3-20210912T1529.tar.bz2) = 33a74539901114386f85592e6e1d8f7349753fd5484f535474f31c2a79cab61f02d0efbcd4f7d6dab35b853d306883b5c14f79874c052603b2cb8051b22d28e8 From 65967e44d95d29bc3adfbc22e31d1a3b2b0cfc63 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 23 Sep 2021 14:30:11 +0900 Subject: [PATCH 19/42] Update to the latest git --- .gitignore | 1 + mcomix3.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4452852..75998df 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /mcomix3-20210730T1400.tar.bz2 /mcomix3-20210810T1753.tar.bz2 /mcomix3-20210912T1529.tar.bz2 +/mcomix3-20210923T1342.tar.bz2 diff --git a/mcomix3.spec b/mcomix3.spec index 9be03fb..940dea2 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,9 +1,9 @@ -%global gitcommit 8cd3ebe290a9f05469045ef09ab85e06be5103bd -%global gitdate 20210829 +%global gitcommit cff5fc3e8214e56b112e6469e544fa7b97690aa4 +%global gitdate 20210916 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210912 -%global tarballtime 1529 +%global tarballdate 20210923 +%global tarballtime 1342 %global base_summary User-friendly, customizable image viewer for comic books @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.20.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.21.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -225,6 +225,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Sep 23 2021 Mamoru TASAKA - 0-0.21.D20210916gitcff5fc3 +- Update to the latest git + * Sun Sep 12 2021 Mamoru TASAKA - 0-0.20.D20210829git8cd3ebe - Update to the latest git - Split whole package into -base and -thumbnailer (ref: bug 1965831) diff --git a/sources b/sources index 3ac1230..49159eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210912T1529.tar.bz2) = 33a74539901114386f85592e6e1d8f7349753fd5484f535474f31c2a79cab61f02d0efbcd4f7d6dab35b853d306883b5c14f79874c052603b2cb8051b22d28e8 +SHA512 (mcomix3-20210923T1342.tar.bz2) = 94d5719b881a4a6c37c182d14466d09cd43848a9beb8dce8aa9770a3c81e96eb1968c442bbb8b604f4c154922a690ee6a03b50542db3535cdf37bdd96250212e From 7cb24a5ca95a9b2635959dd0cbe5b36e3d5b124e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Oct 2021 15:08:15 +0900 Subject: [PATCH 20/42] Update to the latest git --- mcomix3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index 940dea2..629e537 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,9 +1,9 @@ -%global gitcommit cff5fc3e8214e56b112e6469e544fa7b97690aa4 -%global gitdate 20210916 +%global gitcommit 483f4b3f2d9a125606d47597ae7eff3b38e5bf9d +%global gitdate 20211016 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210923 -%global tarballtime 1342 +%global tarballdate 20211017 +%global tarballtime 1503 %global base_summary User-friendly, customizable image viewer for comic books @@ -225,6 +225,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sun Oct 17 2021 Mamoru TASAKA - 0-0.22.D20211016git483f4b3 +- Update to the latest git + * Thu Sep 23 2021 Mamoru TASAKA - 0-0.21.D20210916gitcff5fc3 - Update to the latest git From f6ec2ea00f9e856c1c626e13185e4bbc2ccc530a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Oct 2021 15:34:30 +0900 Subject: [PATCH 21/42] release bump --- .gitignore | 1 + mcomix3.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75998df..c230322 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mcomix3-20210810T1753.tar.bz2 /mcomix3-20210912T1529.tar.bz2 /mcomix3-20210923T1342.tar.bz2 +/mcomix3-20211017T1503.tar.bz2 diff --git a/mcomix3.spec b/mcomix3.spec index 629e537..f8d9658 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.21.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.22.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -197,6 +197,7 @@ popd # from %%name %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml +# TODO: support ./test/run.py %files diff --git a/sources b/sources index 49159eb..838d39b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20210923T1342.tar.bz2) = 94d5719b881a4a6c37c182d14466d09cd43848a9beb8dce8aa9770a3c81e96eb1968c442bbb8b604f4c154922a690ee6a03b50542db3535cdf37bdd96250212e +SHA512 (mcomix3-20211017T1503.tar.bz2) = 77da1c30644895efd7ce687f92217324e9ffd3ace80acafa818f8856e3b9bca23ed36a1b639cebd2aad715857c9efa0a72638986bb5ab0ba8a76749cc9ec64f4 From 89e6997266e9d65581d253b00727843c21657d8a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 11 Nov 2021 00:38:09 +0900 Subject: [PATCH 22/42] Fix up startup wrapper script wrt positional parameters (bug 2021355) --- mcomix3.spec | 5 ++++- mcomix3starter.sh.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index f8d9658..6131925 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.22.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.23.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Wed Nov 10 2021 Mamoru TASAKA - 0-0.23.D20211016git483f4b3 +- Fix up startup wrapper script wrt positional parameters (bug 2021355) + * Sun Oct 17 2021 Mamoru TASAKA - 0-0.22.D20211016git483f4b3 - Update to the latest git diff --git a/mcomix3starter.sh.in b/mcomix3starter.sh.in index 7a442ad..5da77bb 100644 --- a/mcomix3starter.sh.in +++ b/mcomix3starter.sh.in @@ -1,4 +1,4 @@ #!/bin/sh export PYTHONPATH=@python3_sitelib@/mcomix3/mcomix3 -exec @python3_sitelib@/mcomix3/mcomixstarter.py "$*" +exec @python3_sitelib@/mcomix3/mcomixstarter.py "$@" From 1ba85885be3d0f670b31ba4d0ed4ebf48ecc22c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:57:35 +0000 Subject: [PATCH 23/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 6131925..65b9dfe 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.23.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.24.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0-0.24.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Nov 10 2021 Mamoru TASAKA - 0-0.23.D20211016git483f4b3 - Fix up startup wrapper script wrt positional parameters (bug 2021355) From 85814637f1df59054910f392c2b3dc8df8498121 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:51:23 +0200 Subject: [PATCH 24/42] Rebuilt for Python 3.11 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 65b9dfe..f153e0d 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.24.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.25.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Mon Jun 13 2022 Python Maint - 0-0.25.D20211016git483f4b3 +- Rebuilt for Python 3.11 + * Thu Jan 20 2022 Fedora Release Engineering - 0-0.24.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0ba9fac13561ad26e0c61ab25cb5b9e3bc182b65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:47:25 +0000 Subject: [PATCH 25/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index f153e0d..18ad2c6 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.25.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.26.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0-0.26.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 0-0.25.D20211016git483f4b3 - Rebuilt for Python 3.11 From 6c70db3d45ccaee9ee7c62d516f3ef1ff008d4a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:14:17 +0000 Subject: [PATCH 26/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 18ad2c6..969f401 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.26.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.27.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0-0.27.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0-0.26.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 45394f95d81bfdc6de1adfdfa0242670281709fe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:22:37 +0200 Subject: [PATCH 27/42] Rebuilt for Python 3.12 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 969f401..c026b3d 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.27.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.28.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Jun 13 2023 Python Maint - 0-0.28.D20211016git483f4b3 +- Rebuilt for Python 3.12 + * Thu Jan 19 2023 Fedora Release Engineering - 0-0.27.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e97d0432e4664d3707f718cc9612ff1506933c5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 14:05:29 +0000 Subject: [PATCH 28/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index c026b3d..889cd20 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.28.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.29.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0-0.29.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 0-0.28.D20211016git483f4b3 - Rebuilt for Python 3.12 From bc737190e347263c26a9cb30b877f96003a0c0c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 07:12:09 +0000 Subject: [PATCH 29/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 889cd20..301785c 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.29.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.30.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0-0.30.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0-0.29.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b95b63eaafc1837ec0003dfe44ad8731f9065016 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 06:04:19 +0000 Subject: [PATCH 30/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 301785c..0c81286 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.30.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.31.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0-0.31.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0-0.30.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 70e3d8123a183e4e3bd6ecbdc719df816c3896ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:32:48 +0200 Subject: [PATCH 31/42] Rebuilt for Python 3.13 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 0c81286..ab4c204 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.31.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.32.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jun 07 2024 Python Maint - 0-0.32.D20211016git483f4b3 +- Rebuilt for Python 3.13 + * Thu Jan 25 2024 Fedora Release Engineering - 0-0.31.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8be97762fb63d38ff74710cc41753961ff00e168 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:03:32 +0000 Subject: [PATCH 32/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index ab4c204..1b66fe3 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.32.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.33.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0-0.33.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 0-0.32.D20211016git483f4b3 - Rebuilt for Python 3.13 From 83bf78aee870be4c6d31d32e81d5cda4a79efcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 01:17:57 +0200 Subject: [PATCH 33/42] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- mcomix3.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index 1b66fe3..dfc01b2 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,10 +15,11 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.33.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.34.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/multiSnow/mcomix3 # Use git repository directly - with it when modifying source # we can do it *in git repository* and then we can directly submit @@ -226,6 +227,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0-0.34.D20211016git483f4b3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0-0.33.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 641a51345735967016f92fd0ffd15977226afefe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 Aug 2024 13:43:15 +0900 Subject: [PATCH 34/42] Workaround for zip archiver for contents info Workaround for zip archiver for contents info Workaround for zip archiver for contents info --- ...nd-on-zip-archiver-for-contents-info.patch | 29 +++++++++++++++++++ mcomix3.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0004-Workaround-on-zip-archiver-for-contents-info.patch diff --git a/0004-Workaround-on-zip-archiver-for-contents-info.patch b/0004-Workaround-on-zip-archiver-for-contents-info.patch new file mode 100644 index 0000000..bac20a9 --- /dev/null +++ b/0004-Workaround-on-zip-archiver-for-contents-info.patch @@ -0,0 +1,29 @@ +From 8fcab042bb7c7c8d012a07515e276a3b5e7df5da Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sat, 17 Aug 2024 12:53:56 +0900 +Subject: [PATCH] Workaround on zip archiver for contents info + +--- + mcomix/mcomix/archive/zip_py.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/mcomix/mcomix/archive/zip_py.py b/mcomix/mcomix/archive/zip_py.py +index f579759..41fd8ac 100644 +--- a/mcomix/mcomix/archive/zip_py.py ++++ b/mcomix/mcomix/archive/zip_py.py +@@ -38,7 +38,11 @@ class ZipArchive(archive_base.NonUnicodeArchive): + else: + # zipfile use cp437 to decode non-utf8 filename + # revert to bytes before guessing encode +- fn_bytes = info.filename.encode('cp437') ++ try: ++ fn_bytes = info.filename.encode('cp437') ++ except UnicodeEncodeError: ++ # try as it is ++ fn_bytes = info.filename + self._contents_info[self._unicode_filename(fn_bytes)] = info + + self.is_encrypted = self._has_encryption() +-- +2.46.0 + diff --git a/mcomix3.spec b/mcomix3.spec index dfc01b2..a7bb305 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.34.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.35.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -32,6 +32,7 @@ Source2: mcomix3starter.sh.in # Patches Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch +Patch4: 0004-Workaround-on-zip-archiver-for-contents-info.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -81,6 +82,7 @@ git checkout -b %{version}-%{release}-fedora %{gitcommit} # Apply patches cat %{PATCH2} | git am cat %{PATCH3} | git am +cat %{PATCH4} | git am %build pushd %{name} @@ -227,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sat Aug 17 2024 Mamoru TASAKA - 0-0.35.D20211016git483f4b3 +- Workaround for zip archiver for contents info + * Fri Jul 26 2024 Miroslav Suchý - 0-0.34.D20211016git483f4b3 - convert license to SPDX From 496d2f0808a01c5aee94639e7dc808307e8dd5a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 17:17:46 +0000 Subject: [PATCH 35/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index a7bb305..a326b2c 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.35.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.36.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0-0.36.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Aug 17 2024 Mamoru TASAKA - 0-0.35.D20211016git483f4b3 - Workaround for zip archiver for contents info From a8d291b99fd9ba231ae9d35bd392c674c397720a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:57:44 +0200 Subject: [PATCH 36/42] Rebuilt for Python 3.14 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index a326b2c..f1e3246 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.36.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.37.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Mon Jun 02 2025 Python Maint - 0-0.37.D20211016git483f4b3 +- Rebuilt for Python 3.14 + * Fri Jan 17 2025 Fedora Release Engineering - 0-0.36.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e5d9746438b818524fae3d1d36641c6d20e577a6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 3 Jun 2025 14:50:13 +0900 Subject: [PATCH 37/42] Rescue when creating thumbnail fails in load_pixbuf_size (ref: bug 2368354, 2369016) --- ...ting-thumbnail-fails-in-load_pixbuf_.patch | 44 +++++++++++++++++++ mcomix3.spec | 10 ++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch diff --git a/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch b/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch new file mode 100644 index 0000000..fc69844 --- /dev/null +++ b/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch @@ -0,0 +1,44 @@ +From 31f6d516fc044d4748dac98ab6117035d938389e Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Tue, 3 Jun 2025 14:02:01 +0900 +Subject: [PATCH] Rescue when creating thumbnail fails in load_pixbuf_size + +--- + mcomix/mcomix/thumbnail_tools.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/mcomix/mcomix/thumbnail_tools.py b/mcomix/mcomix/thumbnail_tools.py +index 35b4692..3b51cd2 100644 +--- a/mcomix/mcomix/thumbnail_tools.py ++++ b/mcomix/mcomix/thumbnail_tools.py +@@ -142,8 +142,11 @@ class Thumbnailer(object): + if not os.path.isfile(image_path): + return None, None + +- pixbuf = image_tools.load_pixbuf_size(image_path, self.width, self.height) +- if self.store_on_disk: ++ try: ++ pixbuf = image_tools.load_pixbuf_size(image_path, self.width, self.height) ++ except: ++ pixbuf = None ++ if pixbuf and self.store_on_disk: + tEXt_data = self._get_text_data(image_path) + # Use the archive's mTime instead of the extracted file's mtime + tEXt_data['tEXt::Thumb::MTime'] = str(os.stat(filepath).st_mtime) +@@ -153,8 +156,11 @@ class Thumbnailer(object): + return pixbuf, tEXt_data + + elif image_tools.is_image_file(filepath, check_mimetype=True): +- pixbuf = image_tools.load_pixbuf_size(filepath, self.width, self.height) +- if self.store_on_disk: ++ try: ++ pixbuf = image_tools.load_pixbuf_size(filepath, self.width, self.height) ++ except: ++ pixbuf = None ++ if pixbuf and self.store_on_disk: + tEXt_data = self._get_text_data(filepath) + else: + tEXt_data = None +-- +2.49.0 + diff --git a/mcomix3.spec b/mcomix3.spec index f1e3246..17cf435 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.37.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.38.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -33,6 +33,9 @@ Source2: mcomix3starter.sh.in Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch Patch4: 0004-Workaround-on-zip-archiver-for-contents-info.patch +# Rescue when creating thumbnail fails in load_pixbuf_size +# (ref: bug 2368354, 2369016) +Patch5: 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -83,6 +86,7 @@ git checkout -b %{version}-%{release}-fedora %{gitcommit} cat %{PATCH2} | git am cat %{PATCH3} | git am cat %{PATCH4} | git am +cat %{PATCH5} | git am %build pushd %{name} @@ -229,6 +233,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Jun 03 2025 Mamoru TASAKA - 0-0.38.D20211016git483f4b3 +- Rescue when creating thumbnail fails in load_pixbuf_size + (ref: bug 2368354, 2369016) + * Mon Jun 02 2025 Python Maint - 0-0.37.D20211016git483f4b3 - Rebuilt for Python 3.14 From afc871a5550f233cbc6f87a8227c6592b67ae8ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:28:14 +0000 Subject: [PATCH 38/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 17cf435..5b1a414 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.38.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.39.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -233,6 +233,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0-0.39.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Mamoru TASAKA - 0-0.38.D20211016git483f4b3 - Rescue when creating thumbnail fails in load_pixbuf_size (ref: bug 2368354, 2369016) From 1f57b9ef702b8e6cf3bcf4dfd4c0b2353bbc0067 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:59:18 +0200 Subject: [PATCH 39/42] Rebuilt for Python 3.14.0rc2 bytecode --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 5b1a414..e621ebf 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.39.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.40.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -233,6 +233,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Aug 15 2025 Python Maint - 0-0.40.D20211016git483f4b3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Jul 24 2025 Fedora Release Engineering - 0-0.39.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ac83115f870ffade44b92ad121d5687cceb56ab2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 20 Aug 2025 17:24:48 +0900 Subject: [PATCH 40/42] sqlite3.py: support python 3.14 --- 0006-sqlite3.py-support-python-3.14.patch | 27 +++++++++++++++++++++++ mcomix3.spec | 9 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0006-sqlite3.py-support-python-3.14.patch diff --git a/0006-sqlite3.py-support-python-3.14.patch b/0006-sqlite3.py-support-python-3.14.patch new file mode 100644 index 0000000..7b2a899 --- /dev/null +++ b/0006-sqlite3.py-support-python-3.14.patch @@ -0,0 +1,27 @@ +From 077f2ad403bfc47ceb4e4961ad9a4fb1e883d904 Mon Sep 17 00:00:00 2001 +From: mcomix3 Fedora maintainer +Date: Wed, 20 Aug 2025 17:20:58 +0900 +Subject: [PATCH] sqlite3.py: support python 3.14 + +ref: https://github.com/python/cpython/issues/93370 +sqlite3.version is deprecated +--- + mcomix/mcomix/sqlite3.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mcomix/mcomix/sqlite3.py b/mcomix/mcomix/sqlite3.py +index 212cc84..58608bf 100644 +--- a/mcomix/mcomix/sqlite3.py ++++ b/mcomix/mcomix/sqlite3.py +@@ -2,7 +2,7 @@ from mcomix import log + + try: + import sqlite3 +- log.debug(f'SQLite: {sqlite3.sqlite_version} sqlite3 version: {sqlite3.version}') ++ log.debug(f'SQLite: {sqlite3.sqlite_version} sqlite3 version: {sqlite3.sqlite_version}') + except ImportError: + log.warning( _('! Could find sqlite3.') ) + sqlite3 = None +-- +2.50.1 + diff --git a/mcomix3.spec b/mcomix3.spec index e621ebf..e9cef51 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.40.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.41.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -36,6 +36,9 @@ Patch4: 0004-Workaround-on-zip-archiver-for-contents-info.patch # Rescue when creating thumbnail fails in load_pixbuf_size # (ref: bug 2368354, 2369016) Patch5: 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch +# sqlite3.py: support python 3.14 +# ref: https://github.com/python/cpython/issues/9337 +Patch6: 0006-sqlite3.py-support-python-3.14.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -87,6 +90,7 @@ cat %{PATCH2} | git am cat %{PATCH3} | git am cat %{PATCH4} | git am cat %{PATCH5} | git am +cat %{PATCH6} | git am %build pushd %{name} @@ -233,6 +237,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Wed Aug 20 2025 Mamoru TASAKA - 0-0.41.D20211016git483f4b3 +- sqlite3.py: support python 3.14 + * Fri Aug 15 2025 Python Maint - 0-0.40.D20211016git483f4b3 - Rebuilt for Python 3.14.0rc2 bytecode From 105894769134d481ec44df1707670b2495471e4f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:30:09 +0200 Subject: [PATCH 41/42] Rebuilt for Python 3.14.0rc3 bytecode --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index e9cef51..82fd420 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.41.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.42.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -237,6 +237,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Sep 19 2025 Python Maint - 0-0.42.D20211016git483f4b3 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Aug 20 2025 Mamoru TASAKA - 0-0.41.D20211016git483f4b3 - sqlite3.py: support python 3.14 From e39763d45da90d73fd43fb78b424a088ee2a0ef9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 3 Jan 2026 17:42:35 +0900 Subject: [PATCH 42/42] Restore space / pageup button behavior (bug 2426924) --- ...store-space-pageup-button-behavior-i.patch | 29 +++++++++++++++++++ mcomix3.spec | 9 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0007-Workaround-to-restore-space-pageup-button-behavior-i.patch diff --git a/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch b/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch new file mode 100644 index 0000000..f3df5dd --- /dev/null +++ b/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch @@ -0,0 +1,29 @@ +From 2c49b1239bde5c789aea1a03beb098539ee01e49 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sat, 3 Jan 2026 17:36:44 +0900 +Subject: [PATCH] Workaround to restore space / pageup button behavior in + recent GTK + +--- + mcomix/mcomix/keybindings.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mcomix/mcomix/keybindings.py b/mcomix/mcomix/keybindings.py +index 02c586f..725cc82 100644 +--- a/mcomix/mcomix/keybindings.py ++++ b/mcomix/mcomix/keybindings.py +@@ -165,7 +165,10 @@ class _KeybindingManager(object): + # so limit possible states to begin with? + for stored_binding, action in self._binding_to_action.items(): + stored_keycode, stored_flags = stored_binding +- if stored_keycode == keybinding[0] and stored_flags & keybinding[1]: ++ if stored_keycode == keybinding[0] and ( ++ (stored_flags & keybinding[1]) or ++ ((not stored_flags) and (not keybinding[1])) ++ ): + func, args, kwargs = self._action_to_callback[action] + self._window.stop_emission_by_name('key_press_event') + return func(*args, **kwargs) +-- +2.52.0 + diff --git a/mcomix3.spec b/mcomix3.spec index 82fd420..ea05906 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.42.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.43.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -39,6 +39,9 @@ Patch5: 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch # sqlite3.py: support python 3.14 # ref: https://github.com/python/cpython/issues/9337 Patch6: 0006-sqlite3.py-support-python-3.14.patch +# Restore space / pageup button behavior in recent GTK +# (ref: bug 2426924 +Patch7: 0007-Workaround-to-restore-space-pageup-button-behavior-i.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -91,6 +94,7 @@ cat %{PATCH3} | git am cat %{PATCH4} | git am cat %{PATCH5} | git am cat %{PATCH6} | git am +cat %{PATCH7} | git am %build pushd %{name} @@ -237,6 +241,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sat Jan 03 2026 Mamoru TASAKA - 0-0.43.D20211016git483f4b3 +- Restore space / pageup button behavior (bug 2426924) + * Fri Sep 19 2025 Python Maint - 0-0.42.D20211016git483f4b3 - Rebuilt for Python 3.14.0rc3 bytecode