rpms/gourmet/F-12 gourmet_generic_web_importer_plugin_fix.patch, NONE, 1.1 gourmet_interactive_importer_crash_fixed.patch, NONE, 1.1 gourmet.spec, 1.20, 1.21

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/gourmet/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11918

Modified Files:
	gourmet.spec 
Added Files:
	gourmet_generic_web_importer_plugin_fix.patch 
	gourmet_interactive_importer_crash_fixed.patch 
Log Message:
* Tue Jun 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.4-4
- Brown bag patch fix


gourmet_generic_web_importer_plugin_fix.patch:
 generic_web_importer_plugin.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gourmet_generic_web_importer_plugin_fix.patch ---
--- ./src/lib/plugins/import_export/web_import_plugin/generic_web_importer_plugin.py	2009-12-31 04:14:06.000000000 -0900
+++ ../generic_web_importer_plugin.py	2010-06-08 22:15:01.896155203 -0800
@@ -26,8 +26,10 @@
         for p in self.plugins:
             if p.test_url(url, data):
                 return 1
-        if 'html' in content_type:
-            return -1 # We are the fallback option
+        if getattr(content_type,'__iter__',False) or getattr(content_type,'__getitem__',False):
+            if 'html' in content_type:
+                return -1 # We are the fallback option
+        return 0
 
     def get_web_importer (self, url, data, content_type):
         highest = 0

gourmet_interactive_importer_crash_fixed.patch:
 interactive_importer.py.fixed |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gourmet_interactive_importer_crash_fixed.patch ---
--- ./src/lib/importers/interactive_importer.py	2010-01-16 05:51:42.000000000 -0900
+++ /home/jspaleta/Desktop/interactive_importer.py.fixed	2010-06-07 12:38:40.857369161 -0800
@@ -246,7 +246,8 @@
         else:
             # Otherwise, there's no clear sane default... we'll just
             # select the current whole line
-            cur_pos = self.tb.get_insert()
+            cur_mark = self.tb.get_insert()
+            cur_pos=gtk.TextBuffer.get_iter_at_mark(cur_pos)
             cur_pos.backward_chars(
                 cur_pos.get_line_offset())
             st = cur_pos
@@ -510,8 +511,8 @@
 
     def set_text (self, txt):
         txt = unicode(txt) # convert to unicode for good measure
-        txt = self.parser.parse(txt) # Parse
         txt = re.sub('(\n\s*\n)+','\n\n',txt) # Take out extra newlines
+        txt = self.parser.parse(txt) # Parse
         self.set_parsed(txt)
 
     def set_parsed (self, parsed):


Index: gourmet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gourmet/F-12/gourmet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gourmet.spec	1 May 2010 18:24:08 -0000	1.20
+++ gourmet.spec	12 Jul 2010 16:27:01 -0000	1.21
@@ -2,13 +2,15 @@
 
 Name:		gourmet
 Version:	0.15.4
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	Recipe Manager for the GNOME desktop environment
 
 Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://grecipe-manager.sourceforge.net
 Source0:	http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz
+Patch0:		gourmet_interactive_importer_crash_fixed.patch
+Patch1:		gourmet_generic_web_importer_plugin_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -17,7 +19,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:  gettext,intltool
 
 Requires: gnome-python2, gnome-python2-gnomeprint
-Requires: metakit
+Requires: metakit,pypoppler
 Requires: pygtk2, gnome-python2-gtkspell 
 Requires: PyRTF,python-sqlalchemy
 Requires: python-imaging, python-sqlite2, pygtk2-libglade, python-reportlab
@@ -28,6 +30,8 @@ files and exports webpages & other forma
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 #chmod -x data/recipe.dtd
 
 %build
@@ -69,6 +73,15 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Tue Jun 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.4-4
+- Brown bag patch fix
+
+* Mon Jun 7 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.4-3
+- Added patches to fix web page importer bugs 
+
+* Mon Jun 7 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.4-2
+- Added requires for pypoppler so printing will work
+
 * Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15.4-1
 - New upstream point release, minor bug fixes and enhancements