- find system dropboxd

- drop bogus wget dep

Changed files:
    dropboxd-path.patch -> 1.1
    nautilus-dropbox.spec -> 1.10

diff --git a/dropboxd-path.patch b/dropboxd-path.patch
new file mode 100644 (file)
index 0000000..f39a0ed
--- /dev/null
+++ b/dropboxd-path.patch
@@ -0,0 +1,14 @@
+--- nautilus-dropbox-0.6.3/dropbox.in~ 2010-06-15 02:36:52.000000000 +0300
++++ nautilus-dropbox-0.6.3/dropbox.in  2010-07-08 20:55:18.697946297 +0300
+@@ -524,7 +524,10 @@
+     return newmeth
+ 
+ def start_dropbox():
+-    db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
++      # first try dropboxd from system, fallback to user install
++    db_path = "/usr/bin/dropboxd"
++    if not os.access(db_path, os.X_OK):
++              db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
+     if os.access(db_path, os.X_OK):
+         f = open("/dev/null", "w")
+         # we don't reap the child because we're gonna die anyway, let init do it

diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index f89f858c387a9de5fa5bb35925f32fc6816036f1..f8e32d14b249b0d94941e0f405c96cdc1ca37487 100644 (file)
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -7,6 +7,7 @@ License:        GPL v2 with exceptions
 Group:         X11/Applications
 Source0:       http://linux.getdropbox.com/packages/%{name}-%{version}.tar.bz2
 # Source0-md5: aed416ff7876c8bd6a4690c8e8529db1
+Patch0:                dropboxd-path.patch
 URL:           http://getdropbox.com/
 BuildRequires: glib2-devel >= 1:2.14.0
 BuildRequires: gtk+2-devel >= 2:2.12.0
@@ -20,7 +21,6 @@ BuildRequires:        rpmbuild(macros) >= 1.311
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires:      nautilus >= 2.16.0
-Requires:      wget >= 1.10.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,6 +35,7 @@ pomiędzy określonymi maszynami.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \