From 9ac944638fa16305756f537b55ffc0f39027c15a Mon Sep 17 00:00:00 2001
From: TASAKA Mamoru <mtasaka@localhost.localdomain>
Date: Dec 26 2011 04:34:03 +0000
Subject: 0.96


---

diff --git a/.gitignore b/.gitignore
index 59717ae..f5e582b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mcomix-0.94.tar.bz2
 /mcomix-0.95.tar.bz2
+/mcomix-0.96.tar.bz2
diff --git a/mcomix-0.95-termination-from-nonX.patch b/mcomix-0.95-termination-from-nonX.patch
deleted file mode 100644
index 1e3a83b..0000000
--- a/mcomix-0.95-termination-from-nonX.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mcomix-0.95/mcomix/main.py.debug	2011-11-05 05:13:53.000000000 +0900
-+++ mcomix-0.95/mcomix/main.py	2011-12-14 13:17:17.554104349 +0900
-@@ -1120,7 +1120,8 @@
-             if thread is not threading.currentThread():
-                 thread.join()
- 
--        gtk.main_quit()
-+        if gtk.main_level() > 0:
-+            gtk.main_quit()
- 
- #: Main window instance
- __main_window = None
diff --git a/mcomix.spec b/mcomix.spec
index 3dc3906..c162e5b 100644
--- a/mcomix.spec
+++ b/mcomix.spec
@@ -1,6 +1,6 @@
 Name:		mcomix
-Version:	0.95
-Release:	2%{?dist}
+Version:	0.96
+Release:	1%{?dist}
 Summary:	User-friendly, customizable image viewer for comic books
 
 Group:		Amusements/Graphics
@@ -13,9 +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.94-gettext-system-install.patch
-# Terminating mcomix from non-X causes RuntimeError
-# bug 767300
-Patch2:		mcomix-0.95-termination-from-nonX.patch
 
 BuildArch:	noarch
 BuildRequires:	gettext
@@ -42,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 .nonx
 
 %build
 # save timestamps
@@ -162,6 +158,9 @@ exit 0
 
 
 %changelog
+* Mon Dec 26 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.96-1
+- 0.96
+
 * Wed Dec 14 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.95-2
 - Prevent RuntimeError when terminating mcomix from terminal
   (bug 767300)
diff --git a/sources b/sources
index b317a98..33b5e6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4942caa4ad06cdcd25908574f7f1fa3  mcomix-0.95.tar.bz2
+f72865200959af4cb40d9812c47fc0f1  mcomix-0.96.tar.bz2