diff --git a/.gitignore b/.gitignore index c230322..a04c04f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,2 @@ /mcomix3-20190915T1557.tar.bz2 /mcomix3-20191230T1643.tar.bz2 -/mcomix3-20210221T1251.tar.bz2 -/mcomix3-20210309T2023.tar.bz2 -/mcomix3-20210326T1416.tar.bz2 -/mcomix3-20210401T1125.tar.bz2 -/mcomix3-20210501T1509.tar.bz2 -/mcomix3-20210507T1743.tar.bz2 -/mcomix3-20210730T1400.tar.bz2 -/mcomix3-20210810T1753.tar.bz2 -/mcomix3-20210912T1529.tar.bz2 -/mcomix3-20210923T1342.tar.bz2 -/mcomix3-20211017T1503.tar.bz2 diff --git a/0001-Handle-encoding-exception-when-loading-bookmark-pick.patch b/0001-Handle-encoding-exception-when-loading-bookmark-pick.patch new file mode 100644 index 0000000..b4801e9 --- /dev/null +++ b/0001-Handle-encoding-exception-when-loading-bookmark-pick.patch @@ -0,0 +1,36 @@ +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/0002-Change-domain-name-for-gettext.patch b/0002-Change-domain-name-for-gettext.patch index 262158b..b0f1c54 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, 8, 0) + REQUIRED_PIL_VERSION = '5.1.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/0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch b/0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch new file mode 100644 index 0000000..46fdfb4 --- /dev/null +++ b/0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch @@ -0,0 +1,29 @@ +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/0004-Workaround-on-zip-archiver-for-contents-info.patch b/0004-Workaround-on-zip-archiver-for-contents-info.patch deleted file mode 100644 index bac20a9..0000000 --- a/0004-Workaround-on-zip-archiver-for-contents-info.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch b/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch deleted file mode 100644 index fc69844..0000000 --- a/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/0006-sqlite3.py-support-python-3.14.patch b/0006-sqlite3.py-support-python-3.14.patch deleted file mode 100644 index 7b2a899..0000000 --- a/0006-sqlite3.py-support-python-3.14.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch b/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch deleted file mode 100644 index f3df5dd..0000000 --- a/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/create-mcomix3-git-bare-tarball.sh b/create-mcomix3-git-bare-tarball.sh index a5135e6..e00c04c 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 --format=fuller | head -n 12 +git log 2>&1 | head -n 3 echo popd diff --git a/mcomix3.spec b/mcomix3.spec index ea05906..4d0dc5e 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -1,25 +1,17 @@ -%global gitcommit 483f4b3f2d9a125606d47597ae7eff3b38e5bf9d -%global gitdate 20211016 +%global gitcommit a098f817272443a22ddd80d40b9eb00a0ed429c9 +%global gitdate 20191205 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20211017 -%global tarballtime 1503 - -%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. - +%global tarballdate 20191230 +%global tarballtime 1643 Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.43.D%{gitdate}git%{shortcommit}%{?dist} -Summary: %base_summary +Release: 0.7.D%{gitdate}git%{shortcommit}%{?dist} +Summary: User-friendly, customizable image viewer for comic books # GPL version info is from mcomix/mcomixstarter.py -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ 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 @@ -28,54 +20,34 @@ 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.in +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-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 -# Restore space / pageup button behavior in recent GTK -# (ref: bug 2426924 -Patch7: 0007-Workaround-to-restore-space-pageup-button-behavior-i.patch +Patch4: 0004-Lower-pickle-protocol-version-for-mcomix-compatibili.patch BuildRequires: python3-devel -BuildRequires: %{_bindir}/appstream-util +#BuildRequires: %%{_bindir}/appstream-util BuildRequires: %{_bindir}/desktop-file-install BuildRequires: gettext BuildRequires: git -BuildArch: noarch -Requires: %{name}-base = %{version}-%{release} -Requires: %{name}-thumbnailer = %{version}-%{release} - -Obsoletes: mcomix < 1.2.2 -Obsoletes: comix < 4.0.5 -Provides: mcomix = 1.2.2 - - -%description -%base_description - -%package base -Summary: %base_summary 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 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}. +%description +MComix3 is a user-friendly, customizable image viewer. +It has been forked from the original MComix project and ported to python3. %prep %setup -q -c -T -a 0 @@ -89,12 +61,11 @@ 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 -cat %{PATCH5} | git am -cat %{PATCH6} | git am -cat %{PATCH7} | git am %build pushd %{name} @@ -102,33 +73,12 @@ 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 - -# 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 +popd # Install manually... SITETOPDIR=%{python3_sitelib}/%{name} @@ -145,8 +95,7 @@ cp -a localroot localroot.2 pushd localroot.2/mcomix # Wrapper script -install -cpm 0755 ${BUILDTOPDIR}/mcomix3starter.sh ${DSTTOPDIR} -install -cpm 0755 ${BUILDTOPDIR}/comicthumbstarter.sh ${DSTTOPDIR} +install -cpm 0755 %{SOURCE2} ${DSTTOPDIR} # locale files find mcomix/messages/* -type f | while read f do @@ -154,7 +103,6 @@ do mv $f $dir/%{name}.mo done mv mcomix/messages/* %{buildroot}%{_datadir}/locale/ - # duplicate icon for dir in mcomix/images/*x*/ do @@ -162,205 +110,44 @@ do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$basedir/apps cp -p $dir/*png %{buildroot}%{_datadir}/icons/hicolor/$basedir/apps/%{name}.png done - -# scripts -mv comicthumb.py ${DSTTOPDIR}/ -mv mcomixstarter.py ${DSTTOPDIR}/ - # data files mv mcomix/ ${DSTTOPDIR}/mcomix3/ +# Not needed +rm -f comicthumb.py +mv mcomixstarter.py ${DSTTOPDIR}/ # Ensure that all files are installed -popd # from localroot.2/mcomix +popd rmdir localroot.2/mcomix rmdir localroot.2 -popd # from %%name +popd # Wrapper symlink mkdir %{buildroot}/%{_bindir} -ln -sf ../../${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3 -ln -sf ../../${SITETOPDIR}/comicthumbstarter.sh %{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 +ln -sf ${SITETOPDIR}/mcomix3starter.sh %{buildroot}%{_bindir}/mcomix3 +# Desktop file +mkdir %{buildroot}%{_datadir}/applications desktop-file-install \ --remove-category Application \ --dir %{buildroot}%{_datadir}/applications/ \ - ./%{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 + %{SOURCE10} %find_lang %{name} -%check -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml -# TODO: support ./test/run.py - -%files - -%files base -f %{name}.lang +%files -f %{name}.lang %license COPYING %doc ChangeLog %doc README* %doc TODO %{_bindir}/%{name} - %{python3_sitelib}/%{name}/ - # Do not own %%{_datadir}/icons/hicolor explicitly %{_datadir}/icons/hicolor/*/apps/%{name}.png - -%{_metainfodir}/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop - -%{_mandir}/man1/%{name}.1* - -%files thumbnailer -%{_bindir}/comicthumb -%{_datadir}/thumbnailers/comicthumb.thumbnailer -%{_mandir}/man1/comicthumb.1* - +# TODO: appdata file, not availale yet (should item) %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 - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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 -- 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 - -* 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 - -* 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 - * Tue May 26 2020 Miro Hrončok - 0-0.7.D20191205gita098f81 - Rebuilt for Python 3.9 diff --git a/mcomix3starter.sh b/mcomix3starter.sh new file mode 100644 index 0000000..5c158d3 --- /dev/null +++ b/mcomix3starter.sh @@ -0,0 +1,8 @@ +#!/usr/bin/bash + +SCRIPTPATH="${BASH_SOURCE[0]}" +ABSPATH="$(readlink $SCRIPTPATH)" +SCRIPTDIR=$(cd $(dirname $ABSPATH); pwd) +export PYTHONPATH=${SCRIPTDIR}/mcomix3 + +exec $SCRIPTDIR/mcomixstarter.py "$@" diff --git a/mcomix3starter.sh.in b/mcomix3starter.sh.in deleted file mode 100644 index 5da77bb..0000000 --- a/mcomix3starter.sh.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export PYTHONPATH=@python3_sitelib@/mcomix3/mcomix3 -exec @python3_sitelib@/mcomix3/mcomixstarter.py "$@" - diff --git a/sources b/sources index 838d39b..e767fe7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mcomix3-20211017T1503.tar.bz2) = 77da1c30644895efd7ce687f92217324e9ffd3ace80acafa818f8856e3b9bca23ed36a1b639cebd2aad715857c9efa0a72638986bb5ab0ba8a76749cc9ec64f4 +SHA512 (mcomix3-20191230T1643.tar.bz2) = af2b43c92e66b5322f57c3cfa4dfc6d387f221c4660bca77bc0d6f0187bee8b81602909edff001e8832953d0eb082202104200c2e84c75cfba9bd5909cdde993