diff --git a/.gitignore b/.gitignore deleted file mode 100644 index fbb5630..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/mcomix-0.94.tar.bz2 -/mcomix-0.95.tar.bz2 -/mcomix-0.96.tar.bz2 -/mcomix-0.97.1.tar.bz2 -/mcomix-0.98.tar.bz2 -/mcomix-0.99.tar.bz2 -/mcomix-1.00.tar.bz2 -/mcomix-1.01.tar.bz2 -/mcomix-1.2.1.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9ba8764 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +(20191111 mtasaka) replaced by mcomix3, which ported comix / mcomix to python3 diff --git a/mcomix-0.98-gettext-system-install.patch b/mcomix-0.98-gettext-system-install.patch deleted file mode 100644 index f01d92d..0000000 --- a/mcomix-0.98-gettext-system-install.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- mcomix-0.98/mcomix/i18n.py.debug 2011-09-22 19:53:56.000000000 +0900 -+++ mcomix-0.98/mcomix/i18n.py 2012-06-06 10:00:00.000000000 +0900 -@@ -84,6 +84,14 @@ - translation = gettext.GNUTranslations( - pkg_resources.resource_stream('mcomix.messages', resource)) - break -+ else: -+ root_path = os.path.normpath('/') -+ base_dir = os.path.join(root_path, 'usr') -+ locale_dir = os.path.join (base_dir, 'share', 'locale') -+ if gettext.find(domain=domain, localedir=locale_dir, languages=[lang]): -+ translation = gettext.translation(domain=domain, localedir=locale_dir, -+ languages=[lang], fallback=False) -+ break - - translation.install(unicode=True) - diff --git a/mcomix-1.2.1-PIL6.patch b/mcomix-1.2.1-PIL6.patch deleted file mode 100644 index ca671e0..0000000 --- a/mcomix-1.2.1-PIL6.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urp mcomix-1.2.1.old/mcomix/image_tools.py mcomix-1.2.1/mcomix/image_tools.py ---- mcomix-1.2.1.old/mcomix/image_tools.py 2016-02-13 03:51:58.000000000 +0900 -+++ mcomix-1.2.1/mcomix/image_tools.py 2019-09-08 22:39:14.201047442 +0900 -@@ -14,7 +14,7 @@ try: - from PIL import PILLOW_VERSION - PIL_VERSION = ('Pillow', PILLOW_VERSION) - except ImportError: -- from PIL import VERSION as PIL_VERSION -+ from PIL import __version__ as PIL_VERSION - PIL_VERSION = ('PIL', PIL_VERSION) - from cStringIO import StringIO - -mcomix-1.2.1/mcomix ?????: image_tools.py~ -diff -urp mcomix-1.2.1.old/mcomix/run.py mcomix-1.2.1/mcomix/run.py ---- mcomix-1.2.1.old/mcomix/run.py 2016-02-13 03:52:12.000000000 +0900 -+++ mcomix-1.2.1/mcomix/run.py 2019-09-08 22:41:35.700868400 +0900 -@@ -203,12 +203,12 @@ def run(): - - try: - import PIL.Image -- assert PIL.Image.VERSION >= '1.1.5' -+ assert PIL.Image.__version__ >= '1.1.5' - - except AssertionError: - log.error( _("You don't have the required version of the Python Imaging"), end=' ') - log.error( _('Library (PIL) installed.') ) -- log.error( _('Installed PIL version is: %s') % Image.VERSION ) -+ log.error( _('Installed PIL version is: %s') % PIL.Image.__version__ ) - log.error( _('Required PIL version is: 1.1.5 or higher') ) - wait_and_exit() - -mcomix-1.2.1/mcomix ?????: run.py~ diff --git a/mcomix.spec b/mcomix.spec deleted file mode 100644 index 04fa247..0000000 --- a/mcomix.spec +++ /dev/null @@ -1,259 +0,0 @@ -Name: mcomix -Version: 1.2.1 -Release: 11%{?dist} -Summary: User-friendly, customizable image viewer for comic books - -URL: http://mcomix.sourceforge.net/ -# Version info: mcomix/mcomixstarter.py -License: GPLv2+ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -# Fedora specific(?): patch to search default localedir for gettext files -Patch1: mcomix-0.98-gettext-system-install.patch -# PIL 6 deprecates VERSION -Patch2: mcomix-1.2.1-PIL6.patch - -BuildArch: noarch -BuildRequires: gettext -BuildRequires: pygtk2 -BuildRequires: python2-imaging -BuildRequires: python2-setuptools -BuildRequires: python2-devel -BuildRequires: %{_bindir}/desktop-file-install -BuildRequires: %{_bindir}/appstream-util -# The following BR is really needed for gconf2 macros -BuildRequires: GConf2 -Requires: pygtk2 -Requires: python2-imaging -Requires: python2-setuptools -Requires: python2-subprocess32 -Requires(pre): GConf2 -Requires(preun): GConf2 -Requires(post): GConf2 - -%description -MComix is a user-friendly, customizable image viewer. It is specifically -designed to handle comic books, but also serves as a generic viewer. It -reads images in ZIP, RAR, 7Zip or tar archives as well as plain image files. It -is written in Python and uses GTK+ through the PyGTK bindings. - -%prep -%setup -q -%patch1 -p1 -b .gettext -%patch2 -p1 -b .pil6 - -# Remove unuseful and invalid entry -sed -i mime/mcomix.appdata.xml \ - -e '\@project_group@d' - -%build -# save timestamps -sed -i -e 's|shutil.copy|shutil.copy2|' mcomix/main.py - -# Rename: comicthumb -> mcomicthumb -find . -name comicthumb\* | while read f -do - mv $f $(echo $f | sed -e 's|comicthumb|mcomicthumb|') -done -grep -rl comicthumb . | xargs sed -i -e 's|comicthumb|mcomicthumb|g' - -# Rename: application-x-foo.png -> application-x-mcomix-foo.png -for f in mime/icons/*/application-x-*.png -do - mv $f $(echo $f | sed -e 's|application-x|application-x-%{name}|') -done -grep -rl application-x . | while read f -do - sed -i -e 's|application-x|application-x-%{name}|' $f -done -sed -i -e \ - 's|/application@x|/application@x-%{name}|' \ - ./mime/comicbook.schemas - -# embed Fedora EVR -sed -i -e "/^VERSION/s|^\(.*\)$|\1\nVERSION_fedora = '%{version}-%{release}'|" \ - mcomix/constants.py -sed -i -e "s|constants\.VERSION|constants.VERSION_fedora|" \ - mcomix/about_dialog.py - -for dir in mcomix/messages/*/LC*/ -do - msgfmt --statistics -o $dir/mcomix.mo $dir/mcomix.po || \ - rm -f $dir/mcomix.mo -done - -%install -%__python2 setup.py \ - install \ - --root $RPM_BUILD_ROOT - -%if 0 -# Fix rpmlint on the following file on %%install, -# not on %%prep, %%build -sed -i -e '\@^#!.*%{_bindir}/env@d' \ - $RPM_BUILD_ROOT%{python2_sitelib}/%{name}/mcomixstarter.py -%endif - -desktop-file-install \ - --delete-original \ - --remove-category Application \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - -appstream-util validate-relax --nonet \ - $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas -install -cpm 644 ./mime/comicbook.schemas \ - $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/%{name}.schemas - -# gettext catalog files -mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/ -mv $RPM_BUILD_ROOT%{python2_sitelib}/%{name}/messages/*/ \ - $RPM_BUILD_ROOT%{_datadir}/locale/ - -%find_lang %{name} - -%pre -%gconf_schema_prepare %{name} - -%post -%gconf_schema_upgrade %{name} - -%preun -%gconf_schema_remove %{name} - -%files -f %{name}.lang -%defattr(-,root,root,-) -%license COPYING -%doc ChangeLog README - -%{_sysconfdir}/gconf/schemas/%{name}.schemas - -%{_bindir}/%{name} -%{python2_sitelib}/%{name}/ -# python-setuptools on F-22 and above "normalizes" version -# like 1.01 -> 1.1 -#%%{python_sitelib}/%%{name}-%%{version}-py*.egg-info/ -%{python2_sitelib}/%{name}-*-py*.egg-info/ - -%{_datadir}/applications/%{name}.desktop -%{_datadir}/mime/packages/%{name}.xml - -%{_datadir}/appdata/%{name}.appdata.xml - -%{_mandir}/man1/mcomix.1* -#%%{_mandir}/man1/mcomicthumb.1* - -%{_datadir}/icons/hicolor/*/apps/%{name}* -%{_datadir}/icons/hicolor/*/mimetypes/application-x-*.png - - -%changelog -* Sun Sep 8 2019 Mamoru TASAKA - 1.2.1-11 -- Patch for PIL 6 - -* Thu Jul 25 2019 Fedora Release Engineering - 1.2.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.2.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 1.2.1-6 -- Remove obsolete scriptlets - -* Tue Jan 09 2018 Iryna Shcherbina - 1.2.1-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 1.2.1-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Feb 15 2016 Mamoru TASAKA - 1.2.1-1 -- 1.2.1 - -* Thu Feb 4 2016 Mamoru TASAKA - 1.01-5 -- Fix appdata file (remove invalid entry) - -* Thu Feb 04 2016 Fedora Release Engineering - 1.01-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.01-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 Mamoru TASAKA - 1.01-2 -- Fix path for egg-info - -* Fri Feb 13 2015 Mamoru TASAKA - 1.01-1 -- 1.01 - -* Tue Sep 09 2014 Rex Dieter 1.00-4 -- update scriptlets (icon/mime mostly) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.00-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Apr 28 2013 Mamoru TASAKA - 1.00-1 -- 1.00 - -* Thu Feb 14 2013 Fedora Release Engineering - 0.99-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Jan 15 2013 Mamoru TASAKA - 0.99-3 -- Don't import Image directly and import PIL instead for - F-19 Pillow conversion - Patch from Toshio Kuratomi - (bug 895288) - -* Thu Jul 19 2012 Fedora Release Engineering - 0.99-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 17 2012 Mamoru Tasaka - 0.99-1 -- 0.99 - -* Wed Jun 6 2012 Mamoru Tasaka - 0.98-2 -- Fix the direction of gettext catalog path wrt F-17 usrmove - -* Fri Apr 13 2012 Mamoru Tasaka - 0.98-1 -- 0.98 - -* Mon Mar 5 2012 Mamoru Tasaka - 0.97.1-1 -- 0.97 - -* Fri Jan 13 2012 Fedora Release Engineering - 0.96-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Dec 26 2011 Mamoru Tasaka - 0.96-1 -- 0.96 - -* Wed Dec 14 2011 Mamoru Tasaka - 0.95-2 -- Prevent RuntimeError when terminating mcomix from terminal - (bug 767300) - -* Tue Nov 15 2011 Mamoru Tasaka - 0.95-1 -- 0.95 -- Require python-setuptools (bug 753961) - -* Thu Oct 27 2011 Mamoru Tasaka - 0.94-2 -- Fix rpmlint issue - -* Mon Oct 10 2011 Mamoru Tasaka - 0.94-1 -- 0.94 - -* Sun Aug 28 2011 Mamoru Tasaka - 0.92-1 -- Initial package - diff --git a/sources b/sources deleted file mode 100644 index 32c1569..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1d05ed7596bd670e5b3a97896e6d4d47 mcomix-1.2.1.tar.bz2