From 611e4f2c2f0d4c40bbbdb2ec4557a65cb87cf2bd Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Apr 28 2013 14:30:13 +0000
Subject: 1.00


---

diff --git a/.gitignore b/.gitignore
index 72ee430..67bcaae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mcomix-0.97.1.tar.bz2
 /mcomix-0.98.tar.bz2
 /mcomix-0.99.tar.bz2
+/mcomix-1.00.tar.bz2
diff --git a/mcomix-0.99-import-PIL-for-Image.patch b/mcomix-0.99-import-PIL-for-Image.patch
deleted file mode 100644
index 7b033de..0000000
--- a/mcomix-0.99-import-PIL-for-Image.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Index: mcomix-0.99/mcomix/histogram.py
-===================================================================
---- mcomix-0.99.orig/mcomix/histogram.py
-+++ mcomix-0.99/mcomix/histogram.py
-@@ -1,8 +1,8 @@
- """histogram.py - Draw histograms (RGB) from pixbufs."""
- 
--import Image
--import ImageDraw
--import ImageOps
-+from PIL import Image
-+from PIL import ImageDraw
-+from PIL import ImageOps
- 
- from mcomix import image_tools
- 
-Index: mcomix-0.99/mcomix/image_tools.py
-===================================================================
---- mcomix-0.99.orig/mcomix/image_tools.py
-+++ mcomix-0.99/mcomix/image_tools.py
-@@ -6,9 +6,9 @@ import operator
- import itertools
- import bisect
- import gtk
--import Image
--import ImageEnhance
--import ImageOps
-+from PIL import Image
-+from PIL import ImageEnhance
-+from PIL import ImageOps
- 
- from mcomix.preferences import prefs
- 
-Index: mcomix-0.99/mcomix/library/book_area.py
-===================================================================
---- mcomix-0.99.orig/mcomix/library/book_area.py
-+++ mcomix-0.99/mcomix/library/book_area.py
-@@ -4,8 +4,8 @@ import os
- import urllib
- import gtk
- import gobject
--import Image
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageDraw
- 
- from mcomix.preferences import prefs
- from mcomix import thumbnail_view
-Index: mcomix-0.99/mcomix/run.py
-===================================================================
---- mcomix-0.99.orig/mcomix/run.py
-+++ mcomix-0.99/mcomix/run.py
-@@ -138,7 +138,7 @@ except ImportError:
- 
- # Check PIL library
- try:
--    import Image
-+    from PIL import Image
-     assert Image.VERSION >= '1.1.5'
- 
- except AssertionError:
-Index: mcomix-0.99/mcomix/thumbnail_tools.py
-===================================================================
---- mcomix-0.99.orig/mcomix/thumbnail_tools.py
-+++ mcomix-0.99/mcomix/thumbnail_tools.py
-@@ -9,7 +9,7 @@ import tempfile
- import mimetypes
- import threading
- import itertools
--import Image
-+from PIL import Image
- from urllib import pathname2url
- 
- try:  # The md5 module is deprecated as of Python 2.5, replaced by hashlib.
-Index: mcomix-0.99/mime/comicthumb
-===================================================================
---- mcomix-0.99.orig/mime/comicthumb
-+++ mcomix-0.99/mime/comicthumb
-@@ -22,7 +22,7 @@ import tarfile
- import subprocess
- 
- try:
--    import Image
-+    from PIL import Image
- except ImportError:
-     print '! Could not import the Image module (PIL).'
-     print __doc__
diff --git a/mcomix.spec b/mcomix.spec
index 7d6e4af..5277539 100644
--- a/mcomix.spec
+++ b/mcomix.spec
@@ -1,6 +1,6 @@
 Name:		mcomix
-Version:	0.99
-Release:	4%{?dist}
+Version:	1.00
+Release:	1%{?dist}
 Summary:	User-friendly, customizable image viewer for comic books
 
 Group:		Amusements/Graphics
@@ -13,10 +13,6 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		mcomix-0.92-fedora-rpmbuild-gtk.patch
 # Fedora specific(?): patch to search default localedir for gettext files
 Patch1:		mcomix-0.98-gettext-system-install.patch
-# Don't import Image directory and import PIL instead for
-# F-19 Pillow conversion
-# (bug 895288)
-Patch2:		mcomix-0.99-import-PIL-for-Image.patch
 
 BuildArch:	noarch
 BuildRequires:	gettext
@@ -43,7 +39,6 @@ is written in Python and uses GTK+ through the PyGTK bindings.
 %setup -q
 %patch0 -p1 -b .rpmbuild
 %patch1 -p1 -b .gettext
-%patch2 -p1 -b .pil
 
 %build
 # save timestamps
@@ -163,6 +158,9 @@ exit 0
 
 
 %changelog
+* Sun Apr 28 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.00-1
+- 1.00
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index e3aa2fe..469b4e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1ff7e1955042069d5005b4034e7a914  mcomix-0.99.tar.bz2
+3a916dd9da17043ab59ccd17e26eb932  mcomix-1.00.tar.bz2