[gourmet] Apply patch from upstream to resolve bug 717042

[Jeff Raber]

commit cd8bccdf3cbfd9999012b292a302427a87225028
Author: Jeff Raber <jeff.raber at gmail.com>
Date:   Fri Jun 22 10:47:09 2012 -0500

    Apply patch from upstream to resolve bug 717042

 13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch |   15 +++++++++++++++
 gourmet.spec                                   |   15 ++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
---
diff --git a/13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch b/13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch
new file mode 100644
index 0000000..1b5cdc7
--- /dev/null
+++ b/13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch
@@ -0,0 +1,15 @@
+diff --git a/src/lib/reccard.py b/src/lib/reccard.py
+index 351e405..445e4d4 100644
+--- a/src/lib/reccard.py
++++ b/src/lib/reccard.py
+@@ -2100,7 +2100,9 @@ class IngredientController (plugin_loader.Pluggable):
+                 if type(ing) != int and not isinstance(ing,RecRef):
+                     for att in ['amount','unit','item','ingkey','position','inggroup','optional']:
+                         # Remove all unchanged attrs from dict...
+-                        if getattr(ing,att)==d[att]: del d[att]
++                        if hasattr(d,att):
++                            if getattr(ing,att)==d[att]:
++                                del d[att]
+                     if ing in deleted:
+                         # We have not been deleted...
+                         deleted.remove(ing)
diff --git a/gourmet.spec b/gourmet.spec
index b812199..28c9c01 100644
--- a/gourmet.spec
+++ b/gourmet.spec
@@ -2,13 +2,14 @@
 
 Name:		gourmet
 Version:	0.15.9
-Release:	3%{?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
+Source0:	http://downloads.sourceforge.net/grecipe-manager/%{name}-%{version}.tar.gz
+Patch0:		13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -23,11 +24,12 @@ Requires: PyRTF,python-sqlalchemy
 Requires: python-imaging, pygtk2-libglade, python-reportlab
 %description
 Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping
-lists and allows rapid searching of recipes. It imports mealmaster & mastercook
-files and exports webpages & other formats.
+lists and allows rapid searching of recipes. It imports meal-master & mastercook
+files and exports web pages & other formats.
 
 %prep
 %setup -q
+%patch0 -p1
 
 #chmod -x data/recipe.dtd
 
@@ -58,7 +60,7 @@ rm -rf %buildroot
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc CHANGES PKG-INFO README TODO
+%doc CHANGES PKG-INFO README TODO FAQ
 # documentation
 %_bindir/gourmet
 # sitelib stuff
@@ -70,6 +72,9 @@ rm -rf %buildroot
 %{python_sitelib}/*.egg-info
 
 %changelog
+* Wed Jun 20 2012 Jeff Raber <jeff.raber at gmail.com> - 0.15.9-4
+- Apply patch from upstream to resolve bug 717042
+
 * Wed Feb  8 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15.9-3
 - Remove python-sqlite2 dep as gourmet can use sqlite3 from the stdlib