diff --git a/catfish-0.3.2-stock_info.patch b/catfish-0.3.2-stock_info.patch deleted file mode 100644 index a903d84..0000000 --- a/catfish-0.3.2-stock_info.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- catfish-0.3.2/catfish.py.info 2008-10-24 09:35:21.000000000 +0900 -+++ catfish-0.3.2/catfish.py 2011-12-14 13:29:33.553844836 +0900 -@@ -686,7 +686,7 @@ - _('Click here to start the search daemon.')), - 'daemon:' + daemon + '']) - else: -- status_icon = gtk.STOCK_INFO -+ status_icon = gtk.STOCK_DIALOG_INFO - messages.append([_('No files were found.'), None]) - status = _('No files found for "%s".') % keywords - else: -@@ -800,7 +800,7 @@ - action = re.sub('<[^>]+>', '', action) - action_name, action_value = action.split(':') - subprocess.Popen([action_value]) -- icon, message = gtk.STOCK_INFO, _('The search daemon was started.') -+ icon, message = gtk.STOCK_DIALOG_INFO, _('The search daemon was started.') - except Exception, msg: - if self.options.debug: print 'Debug:', msg - icon, message = (gtk.STOCK_CANCEL diff --git a/catfish-0.4.0-stock-info.patch b/catfish-0.4.0-stock-info.patch new file mode 100644 index 0000000..0ab3e98 --- /dev/null +++ b/catfish-0.4.0-stock-info.patch @@ -0,0 +1,31 @@ +Index: catfish-0.4.0.2/catfish.py +=================================================================== +--- catfish-0.4.0.2.orig/catfish.py ++++ catfish-0.4.0.2/catfish.py +@@ -1103,7 +1103,7 @@ class catfish: + _('Click here to start the search daemon.')), + 'daemon:' + daemon + '']) + else: +- status_icon = Gtk.STOCK_INFO ++ status_icon = Gtk.STOCK_DIALOG_INFO + messages.append([_('No files were found.'), None]) + status = _('No files found.') + else: +@@ -1387,7 +1387,7 @@ class catfish: + action = re.sub('<[^>]+>', '', action) + action_name, action_value = action.split(':') + subprocess.Popen([action_value]) +- icon, message = Gtk.STOCK_INFO, _('The search daemon was started.') ++ icon, message = Gtk.STOCK_DIALOG_INFO, _('The search daemon was started.') + except Exception, msg: + if self.options.debug: print 'Debug:', msg + icon, message = (Gtk.STOCK_CANCEL +@@ -1529,7 +1529,7 @@ class catfish: + listmodel.append(filegroup[4]) + if len(listmodel) == 0: + self.clear_deepsearch = True +- status_icon = Gtk.STOCK_INFO ++ status_icon = Gtk.STOCK_DIALOG_INFO + messages.append([_('No files were found.'), None]) + status = _('No files found.') + else: diff --git a/catfish.spec b/catfish.spec index a82dd66..01f5df0 100644 --- a/catfish.spec +++ b/catfish.spec @@ -15,7 +15,10 @@ License: GPLv2+ URL: https://launchpad.net/catfish-search Source0: https://launchpad.net/catfish-search/%{majorver}/%{mainver}/+download/%{name}-%{mainver}%{?betaver}.tar.bz2 # Don't use missing gtk.STOCK_INFO (bug 753512) -Patch0: catfish-0.4.0.2-stock_info.patch +### TODO: +# the consuming code has moved from pygtk to gi.repository in the +# pygobject3 package. Review if this patch is still necessary +Patch0: catfish-0.4.0-stock_info.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -147,6 +150,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %changelog +* Sat Feb 23 2013 Toshio Kuratomi - 0.4.0.2-2.1 +- Update stock_info patch so that build completes + * Wed Feb 13 2013 Fedora Release Engineering - 0.4.0.2-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild