[nautilus-search-tool/f15/master] Drop unused gnome-desktop dependency
Christopher Aillon
caillon at fedoraproject.org
Thu Mar 24 21:12:05 UTC 2011
commit a8b358272348529e1ce482c8aa0481a061868e49
Author: Christopher Aillon <caillon at redhat.com>
Date: Thu Mar 24 14:07:32 2011 -0700
Drop unused gnome-desktop dependency
nautilus-search-tool-0.3.0-gnome-desktop.patch | 30 ++++++++++++++++++++++++
nautilus-search-tool.spec | 8 ++++-
2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/nautilus-search-tool-0.3.0-gnome-desktop.patch b/nautilus-search-tool-0.3.0-gnome-desktop.patch
new file mode 100644
index 0000000..a95fecc
--- /dev/null
+++ b/nautilus-search-tool-0.3.0-gnome-desktop.patch
@@ -0,0 +1,30 @@
+diff -up nautilus-search-tool-0.3.0/configure.ac.gnome-desktop nautilus-search-tool-0.3.0/configure.ac
+--- nautilus-search-tool-0.3.0/configure.ac.gnome-desktop 2011-03-24 13:18:21.385913209 -0700
++++ nautilus-search-tool-0.3.0/configure.ac 2011-03-24 13:18:43.874632059 -0700
+@@ -6,7 +6,6 @@ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE
+
+ NAUTILUS_REQUIRED=2.10.0
+-GNOME_DESKTOP_REQUIRED=2.10.0
+ GLIB_REQUIRED=2.6.0
+ GNOME_VFS_REQUIRED=2.10.0
+
+@@ -34,7 +34,6 @@ fi
+ PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
+ PKG_CHECK_MODULES(GLIB, glib-2.0)
+ PKG_CHECK_MODULES(GCONF, gconf-2.0)
+-PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED)
+ PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED)
+
+ AC_SUBST(NAUTILUS_CFLAGS)
+diff -up nautilus-search-tool-0.3.0/src/nautilus-search-tool.c.gnome-desktop nautilus-search-tool-0.3.0/src/nautilus-search-tool.c
+--- nautilus-search-tool-0.3.0/src/nautilus-search-tool.c.gnome-desktop 2011-03-24 13:33:40.266425623 -0700
++++ nautilus-search-tool-0.3.0/src/nautilus-search-tool.c 2011-03-24 13:37:52.715269575 -0700
+@@ -35,7 +35,6 @@
+ #include <glib/gi18n-lib.h>
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+-#include <libgnome/gnome-desktop-item.h>
+
+ static void nautilus_search_tool_instance_init (NautilusSearchTool *cvs);
+ static void nautilus_search_tool_class_init (NautilusSearchToolClass *class);
diff --git a/nautilus-search-tool.spec b/nautilus-search-tool.spec
index 4c8a13b..b7bcc11 100644
--- a/nautilus-search-tool.spec
+++ b/nautilus-search-tool.spec
@@ -1,6 +1,6 @@
Name: nautilus-search-tool
Version: 0.3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A Nautilus extension that makes searching for files easier
Group: System Environment/Shells
@@ -12,9 +12,9 @@ Patch1: nautilus-search-tool-no-eels.patch
Patch2: nautilus-search-tool-0.3.0-noninit.patch
Patch3: nautilus-search-tool-0.3.0-startdir.patch
Patch4: nautilus-search-tool-0.3.0-gtk3.patch
+Patch5: nautilus-search-tool-0.3.0-gnome-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gnome-desktop-devel >= 2.10.0
BuildRequires: libtool gettext intltool
BuildRequires: nautilus-devel
BuildRequires: GConf2-devel
@@ -34,6 +34,7 @@ search for files.
%patch2 -p1 -b .noninit
%patch3 -p1 -b .startdir
%patch4 -p1 -b .gtk3
+%patch5 -p1 -b .gnome-desktop
autoconf
%build
@@ -55,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/nautilus/extensions-3.0/*.so
%changelog
+* Thu Mar 24 2011 Christopher Aillon <caillon at redhat.com> - 0.3.0-11
+- Drop unused gnome-desktop dependency
+
* Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 0.3.0-10
- Rebuild against newer gtk
More information about the scm-commits
mailing list