From f8988caa57fde75accd85bbfe339a7401927a7bd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Feb 22 2021 15:41:27 +0000 Subject: Update to the latest git --- 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