rpms/jbrout/F-11 jbrout-hashlib.patch,NONE,1.1 jbrout.spec,1.6,1.7

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/jbrout/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18957

Modified Files:
	jbrout.spec 
Added Files:
	jbrout-hashlib.patch 
Log Message:
Use hashlib if possible.

jbrout-hashlib.patch:

--- NEW FILE jbrout-hashlib.patch ---
diff -up jbrout/jbrout/plugins/multiexport/libs/flickr.py.hashlib jbrout/jbrout/plugins/multiexport/libs/flickr.py
--- jbrout/jbrout/plugins/multiexport/libs/flickr.py.hashlib	2009-07-13 21:29:09.214035838 +0200
+++ jbrout/jbrout/plugins/multiexport/libs/flickr.py	2009-07-13 22:00:54.242161317 +0200
@@ -11,7 +11,11 @@
 ## GNU General Public License for more details.
 ##
 
-import urllib, urllib2, md5, mimetools, mimetypes, os.path
+import urllib, urllib2, mimetools, mimetypes, os.path
+try:
+	import hashlib
+except ImportError:
+	import md5 as hashlib
 from xml.dom import minidom
 
 class FlickrAPI:
@@ -166,7 +170,7 @@ class FlickrAPI:
     sig_str = self.secret
     for key in keys:
       sig_str += key + str(args[key])
-    return md5.new(sig_str).hexdigest()
+    return hashlib.md5(sig_str).hexdigest()
 
 class FlickrUploader:
   def __init__(self, conf,showAuthWin):


Index: jbrout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jbrout/F-11/jbrout.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jbrout.spec	21 Mar 2009 12:31:30 -0000	1.6
+++ jbrout.spec	13 Jul 2009 20:35:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           jbrout
 Version:        0.3.174
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo manager, written in python/pygtk
 Group:          Applications/Multimedia
 License:        GPLv2
@@ -11,6 +11,7 @@ Source1:        jbrout-Makefile
 Source2:        jbrout.desktop
 Source3:        jbrout-usr_bin
 Source4:        jbrout-install.sh
+Patch0:         jbrout-hashlib.patch
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6
@@ -39,6 +40,7 @@ jBrout is able to :
 
 %prep
 %setup -q -n jbrout
+%patch0 -p1 -b .hashlib
 
 cd jbrout/
 TEMPFILE=$(mktemp %{_tmppath}/jbrout-build.XXXXXX)
@@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/jbrout.desktop
 
 %changelog
+* Mon Jul 13 2009 Matěj Cepl <mcepl at redhat.com> - 0.3.174-2
+- Use hashlib if possible.
+
 * Sat Mar 21 2009 Matej Cepl <mcepl at redhat.com> 0.3.174-1
 - New upstream release