[catfish/f16] Don't use missing gtk.STOCK_INFO (bug 753512)

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Dec 14 04:36:05 UTC 2011


commit 98e62b5b7528feff41a6f48d32dde76b4cc8de6c
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Dec 14 13:36:04 2011 +0900

    Don't use missing gtk.STOCK_INFO (bug 753512)

 catfish-0.3.2-stock_info.patch |   20 ++++++++++++++++++++
 catfish.spec                   |   10 ++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/catfish-0.3.2-stock_info.patch b/catfish-0.3.2-stock_info.patch
new file mode 100644
index 0000000..a903d84
--- /dev/null
+++ b/catfish-0.3.2-stock_info.patch
@@ -0,0 +1,20 @@
+--- 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.')),
+                                 '<span size="0">daemon:' + daemon + '</span>'])
+                     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.spec b/catfish.spec
index 830bf38..daa0e8d 100644
--- a/catfish.spec
+++ b/catfish.spec
@@ -1,18 +1,20 @@
 %define		mainver		0.3.2
 %undefine		betaver		
 
-%define		fedoraver	3
+%define		fedoraver	4
 
 
 Name:		catfish
 Version:	%{mainver}
-Release:	%{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist}.2
+Release:	%{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist}
 Summary:	A handy file search tool
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://software.twotoasts.de/index.php?/pages/catfish_summary.html
 Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{mainver}%{?betaver}.tar.gz
+# Don't use missing gtk.STOCK_INFO (bug 753512)
+Patch0:		catfish-0.3.2-stock_info.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -59,6 +61,7 @@ This is a metapackage to install all engines supported by %{name}.
 
 %prep
 %setup -q -n %{name}-%{mainver}%{?betaver}
+%patch0 -p1 -b .info
 # Fix up permissions...
 %{__chmod} 0644 \
 	po/* \
@@ -141,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Dec 14 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.3.2-4
+- Don't use missing gtk.STOCK_INFO (bug 753512)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list