[jbrout] Fix jbrout-purge-no-attribute-attrib.patch and reorder.

[Matej Cepl]

commit a30849dec0cc24974e137bd4d891cc2602214a6c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jul 5 16:34:06 2011 +0200

    Fix jbrout-purge-no-attribute-attrib.patch and reorder.

 TODO                                     |   13 ++++++++++++-
 jbrout-eliminate-metadata-exiftool.patch |    2 +-
 jbrout-purge-no-attribute-attrib.patch   |    4 ++--
 jbrout.spec                              |   10 +++++-----
 4 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/TODO b/TODO
index 7cbeb74..c66dc25 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,12 @@
-Doesn't remove tags.
+bradford:~ $ Traceback (most recent call last):
+  File "/usr/share/jbrout/jbrout.py", line 1762, in on_selecteur_mouseClick
+    self.call_winshow(self.tbl.items, self.tbl.items.index(self.tbl.getSelected()[-1]), self.tbl.getSelected())
+  File "/usr/share/jbrout/jbrout.py", line 1924, in call_winshow
+    sel = self.tbl.setSelected(w.selected)
+  File "/usr/share/jbrout/jbrout.py", line 251, in setSelected
+    ls = [lf.index(i.file) for i in ln] #build the list of index
+  File "/usr/share/jbrout/jbrout/db.py", line 616, in __getFile
+    def __getFile(self):  return dec(os.path.join(self.__getFolder(),self.__getName()))
+  File "/usr/share/jbrout/jbrout/db.py", line 606, in __getFolder
+    except e:
+NameError: global name 'e' is not defined
diff --git a/jbrout-eliminate-metadata-exiftool.patch b/jbrout-eliminate-metadata-exiftool.patch
index eec7a77..d5024da 100644
--- a/jbrout-eliminate-metadata-exiftool.patch
+++ b/jbrout-eliminate-metadata-exiftool.patch
@@ -95,7 +95,7 @@ Index: jbrout/jbrout/jbrout/tools.py
  class PhotoCmd(object):
  
      file = property(lambda self: self.__file)
-@@ -681,88 +678,6 @@ isreal : %s""" % (
+@@ -683,88 +680,6 @@ isreal : %s""" % (
      #    else:
      #        return file
  
diff --git a/jbrout-purge-no-attribute-attrib.patch b/jbrout-purge-no-attribute-attrib.patch
index 3661b32..074a08e 100644
--- a/jbrout-purge-no-attribute-attrib.patch
+++ b/jbrout-purge-no-attribute-attrib.patch
@@ -17,8 +17,8 @@ Index: jbrout/jbrout/jbrout/db.py
 -        na=dec(self.__node.getparent().attrib["name"])
 +        try:
 +            na=dec(self.__node.getparent().attrib["name"])
-+        except e:
-+            print >>sys.stderr, "Catching exception e:\n%s" % e
++        except Exception as exc:
++            print >>sys.stderr, "Catching exception e:\n%s" % exc
 +            print >>sys.stderr, "self.__node = %s" % \
 +                et.tostring(self.__node, encoding="utf-8")
 +            print >>sys.stderr, "self.__node.getparent() = %s" % \
diff --git a/jbrout.spec b/jbrout.spec
index 6cb8ff5..93f264c 100644
--- a/jbrout.spec
+++ b/jbrout.spec
@@ -29,10 +29,10 @@ Patch1:         jbrout-use-freedesktop-directories.patch
 Patch2:         jbrout-eliminate-metadata-exiftool.patch
 # http://code.google.com/p/jbrout/issues/detail?id=186
 Patch3:         jbrout-glade-XML-assert-IconSize.patch
-# EXPERIMENTAL for now, don't distribute!
-Patch4:         jbrout-purge-no-attribute-attrib.patch
 # also attached to http://code.google.com/p/jbrout/issues/detail?id=129
-Patch5:         jbrout-no-double-keywords.patch
+Patch4:         jbrout-no-double-keywords.patch
+# EXPERIMENTAL for now, don't distribute!
+Patch5:         jbrout-purge-no-attribute-attrib.patch
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6
@@ -67,8 +67,8 @@ jBrout is able to :
 %patch1 -p1 -b .freedesktopDir
 %patch2 -p1 -b .noExiftool
 %patch3 -p1 -b .iconsize
-%patch4 -p1 -b .noAttributeAttrib
-%patch5 -p1 -b .noDoubleKeyword
+%patch4 -p1 -b .noDoubleKeyword
+%patch5 -p1 -b .noAttributeAttrib
 sh %{SOURCE5}
 install -p %{SOURCE1} jbrout/Makefile
 install -p -m a+rx,u+w %{SOURCE4} jbrout/install-script