[Lunar-commits] <moonbase> dropbox & nautilus-dropbox: n-d is now optional

[Paul Bredbury]

commit 3e0a83a13a0b7980d2cf73b512e1548bb85b4ba9
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Wed Feb 16 17:41:53 2011 +0700

    dropbox & nautilus-dropbox: n-d is now optional
    
    The libSM dependency gets fulfilled by:
    xorg-server -> libXt -> libSM
---
 zbeta/dropbox/BUILD          |    5 ++---
 zbeta/dropbox/DEPENDS        |    1 -
 zbeta/nautilus-dropbox/BUILD |    3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/zbeta/dropbox/BUILD b/zbeta/dropbox/BUILD
index 3dcab52..ccfc94b 100644
--- a/zbeta/dropbox/BUILD
+++ b/zbeta/dropbox/BUILD
@@ -6,11 +6,10 @@
 
   mkdir -p /opt/dropbox   &&
   cp -Ra * /opt/dropbox/  &&
-  ln -sfn /opt/dropbox/dropboxd /usr/bin/dropboxd
+  ln -sfn /opt/dropbox/dropboxd /usr/bin/dropboxd  &&
 
   if in_depends dropbox Python ; then
-    cp /var/spool/lunar/dropbox.py /usr/bin/dropbox
-    chmod 755 /usr/bin/dropbox
+    install -m 755 $SOURCE_CACHE/$SOURCE2 /usr/bin/dropbox
   fi
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/dropbox/DEPENDS b/zbeta/dropbox/DEPENDS
index 000f35b..7c3e19f 100644
--- a/zbeta/dropbox/DEPENDS
+++ b/zbeta/dropbox/DEPENDS
@@ -2,4 +2,3 @@ depends dbus-glib
 
 optional_depends "Python" "" "" "for the CLI"
 optional_depends "gtk+-2" "" "" "for the GUI"
-optional_depends "libSM"  "" "" "for the GUI"
diff --git a/zbeta/nautilus-dropbox/BUILD b/zbeta/nautilus-dropbox/BUILD
index 55de2b6..ffe8025 100644
--- a/zbeta/nautilus-dropbox/BUILD
+++ b/zbeta/nautilus-dropbox/BUILD
@@ -1,5 +1,8 @@
 (
 
+  # /usr/bin/dropbox is installed by the dropbox module
+  sedit "s:bin_SCRIPTS = dropbox:bin_SCRIPTS =:1" Makefile.in &&
+
   # Run the daemon, don't try to install it locally
   sedit "s:dropbox start -i:dropboxd:1" data/dropbox.desktop &&