[jbrout] Cleanup patches

[Matej Cepl]

commit 9bc70c23225cd0aa9c24f7def4cc7797f56ea9e1
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Jul 2 14:10:00 2011 +0200

    Cleanup patches

 jbrout-allow-Exif-Orientation-zero.patch |   15 +++++----
 jbrout-download-plugin.patch             |   28 ++---------------
 jbrout-survive-bad-thumbnail.patch       |   49 ------------------------------
 jbrout.spec                              |    3 --
 sources                                  |    2 +-
 5 files changed, 13 insertions(+), 84 deletions(-)
---
diff --git a/jbrout-allow-Exif-Orientation-zero.patch b/jbrout-allow-Exif-Orientation-zero.patch
index 246da0b..8e0a577 100644
--- a/jbrout-allow-Exif-Orientation-zero.patch
+++ b/jbrout-allow-Exif-Orientation-zero.patch
@@ -1,15 +1,18 @@
 diff -up jbrout/jbrout/jbrout/tools.py.exifOrientation jbrout/jbrout/jbrout/tools.py
---- jbrout/jbrout/jbrout/tools.py.exifOrientation	2010-12-11 03:17:38.000000000 +0100
-+++ jbrout/jbrout/jbrout/tools.py	2010-12-11 03:20:03.337105931 +0100
-@@ -551,8 +551,9 @@ isreal : %s""" % (
+--- jbrout/jbrout/jbrout/tools.py.exifOrientation	2011-01-16 01:15:18.000000000 +0100
++++ jbrout/jbrout/jbrout/tools.py	2011-03-18 23:10:45.399001668 +0100
+@@ -552,11 +552,9 @@ isreal : %s""" % (
          thumbnail according 'sens'
           """
          if sens=="auto":
 -            if 'Exif.Image.Orientation' in self.__info.exifKeys():
--                sens = autoTrans[int(self.__info['Exif.Image.Orientation'])][0]
+-                exifSens = int(self.__info['Exif.Image.Orientation'])
+-                if exifSens not in autoTrans.keys():
+-                    exifSens = 1
+-                sens = autoTrans[exifSens][0]
 +            if (('Exif.Image.Orientation' in self.__info.exifKeys()) and \
-+                (int(self.__info['Exif.Image.Orientation']) in autoTrans.keys())):
-+                    sens = autoTrans[int(self.__info['Exif.Image.Orientation'])][0]
++                    (int(self.__info['Exif.Image.Orientation']) in autoTrans.keys())):
++                sens = autoTrans[int(self.__info['Exif.Image.Orientation'])][0]
              else:
                  sens = autoTrans[1][0]
          if sens=="rotate90":
diff --git a/jbrout-download-plugin.patch b/jbrout-download-plugin.patch
index 11ef1d0..f8442d2 100644
--- a/jbrout-download-plugin.patch
+++ b/jbrout-download-plugin.patch
@@ -1,7 +1,6 @@
-diff --git a/jbrout/plugins/download/download.py b/jbrout/plugins/download/download.py
-index d23bf7e..2b23ddd 100644
---- a/jbrout/plugins/download/download.py
-+++ b/jbrout/plugins/download/download.py
+diff -up jbrout/jbrout/plugins/download/download.py.downloadPlugin jbrout/jbrout/plugins/download/download.py
+--- jbrout/jbrout/plugins/download/download.py.downloadPlugin	2011-01-16 01:15:18.000000000 +0100
++++ jbrout/jbrout/plugins/download/download.py	2011-03-18 23:12:14.209715415 +0100
 @@ -201,6 +201,10 @@ class WinDownload(GladeApp):
          self.statusBar.push(self.cidStatusBar,
              _('Reading source file information from "%s"') % self.srcFolder)
@@ -43,24 +42,3 @@ index d23bf7e..2b23ddd 100644
          # Completed exiting
          self.btnExecute.set_sensitive(True)
          self.buildListRunning = False
-@@ -811,7 +824,8 @@ class WinDownloadExecute(GladeApp):
-                 self.lblAction.set_label(_('Loading preview'))
-                 yield True
-                 noThumb = False
--                if item[dc.C_EXIF].getThumbnailData():
-+                try:
-+                  if item[dc.C_EXIF].getThumbnailData():
-                     try:
-                         thumbJpeg = item[dc.C_EXIF].getThumbnailData()[1]
-                         loader = gtk.gdk.PixbufLoader ('jpeg')
-@@ -836,7 +850,9 @@ class WinDownloadExecute(GladeApp):
-                             thumbIm = thumbIm.rotate_simple(gtk.gdk.PIXBUF_ROTATE_COUNTERCLOCKWISE)
-                     except:
-                         noThumb = True
--                else:
-+                  else:
-+                    noThumb = True
-+                except:
-                     noThumb = True
-                 if noThumb:
-                     thumbIm = gtk.gdk.pixbuf_new_from_file(
diff --git a/jbrout.spec b/jbrout.spec
index ffb5699..7aec330 100644
--- a/jbrout.spec
+++ b/jbrout.spec
@@ -27,8 +27,6 @@ Patch0:         jbrout-allow-Exif-Orientation-zero.patch
 Patch1:         jbrout-download-plugin.patch
 # http://code.google.com/p/jbrout/issues/detail?id=129
 Patch2:         jbrout-eliminate-metadata-exiftool.patch
-# http://code.google.com/p/jbrout/issues/detail?id=179
-Patch3:         jbrout-survive-bad-thumbnail.patch
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6
@@ -62,7 +60,6 @@ jBrout is able to :
 %patch0 -p1 -b .exifOrientation
 %patch1 -p1 -b .downloadPlugin
 %patch2 -p1 -b .noExiftool
-%patch3 -p1 -b .badThumbnail
 sh %{SOURCE5}
 install -p %{SOURCE1} jbrout/Makefile
 install -p -m a+rx,u+w %{SOURCE4} jbrout/install-script
diff --git a/sources b/sources
index a762def..d209c0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c222794c147db45811ea571cdb5634b4  jbrout.tar.bz2
+1c047a67454bb93df37167a72287ad70  jbrout.tar.bz2