rpms/nautilus-search-tool/devel nautilus-search-tool-0.3.0-gstversion.patch, NONE, 1.1 nautilus-search-tool.spec, 1.17, 1.18

[Paul W. Frields]

Author: pfrields

Update of /cvs/pkgs/rpms/nautilus-search-tool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24432/devel

Modified Files:
	nautilus-search-tool.spec 
Added Files:
	nautilus-search-tool-0.3.0-gstversion.patch 
Log Message:
Cope with missing --version on gnome-search-tool (#516491)

nautilus-search-tool-0.3.0-gstversion.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE nautilus-search-tool-0.3.0-gstversion.patch ---
diff -uNr nautilus-search-tool-0.3.0-orig/configure.ac nautilus-search-tool-0.3.0/configure.ac
--- nautilus-search-tool-0.3.0-orig/configure.ac	2009-10-25 17:30:07.000000000 -0400
+++ nautilus-search-tool-0.3.0/configure.ac	2009-10-25 17:31:07.000000000 -0400
@@ -57,7 +57,8 @@
 AC_SUBST(NAUTILUS_EXTENSION_DIR)
 
 # Get gnome-search-tool version
-GNOME_SEARCH_TOOL_VERSION=`$GNOME_SEARCH_TOOL --version`
+#GNOME_SEARCH_TOOL_VERSION=`$GNOME_SEARCH_TOOL --version`
+GNOME_SEARCH_TOOL_VERSION="gnome-search-tool `rpm -qf --qf '%{VERSION}' /usr/bin/gnome-search-tool`"
 AC_SUBST(GNOME_SEARCH_TOOL_VERSION)
 AC_DEFINE_UNQUOTED(GNOME_SEARCH_TOOL_VERSION, "$GNOME_SEARCH_TOOL_VERSION", [gnome-search-tool version])
 


Index: nautilus-search-tool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-search-tool/devel/nautilus-search-tool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- nautilus-search-tool.spec	25 Jul 2009 15:47:59 -0000	1.17
+++ nautilus-search-tool.spec	2 Nov 2009 12:41:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nautilus-search-tool
 Version:        0.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Nautilus extension that makes searching for files easier
 
 Group:          System Environment/Shells
@@ -10,9 +10,10 @@ Source0:        http://dl.sourceforge.ne
 Patch0:         nautilus-search-tool-0.3.0-headers-typos.patch
 Patch1:         nautilus-search-tool-no-eels.patch
 Patch2:         nautilus-search-tool-0.3.0-noninit.patch
+Patch3:         nautilus-search-tool-0.3.0-gstversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-desktop-devel >= 2.10.0 eel2-devel >= 2.10.0
+BuildRequires:  gnome-desktop-devel >= 2.10.0
 BuildRequires:	libtool gettext intltool
 BuildRequires:	nautilus-devel
 BuildRequires:  /usr/bin/gnome-search-tool
@@ -27,6 +28,7 @@ search for files.
 %patch0 -p1 -b .headers-typos
 %patch1 -p1 -b .no-eels
 %patch2 -p1 -b .noninit
+%patch3 -p1 -b .gstversion
 autoconf
 
 %build
@@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Mon Nov 02 2009 Paul W. Frields <stickster at gmail.com> - 0.3.0-4
+- Cope with missing --version in gnome-search-tool (#516491)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild