Author: glen Date: Thu Jul 8 18:00:45 2010 GMT Module: packages Tag: HEAD ---- Log message: - find system dropboxd - drop bogus wget dep
---- Files affected: packages/nautilus-dropbox: nautilus-dropbox.spec (1.9 -> 1.10) , dropboxd-path.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nautilus-dropbox/nautilus-dropbox.spec diff -u packages/nautilus-dropbox/nautilus-dropbox.spec:1.9 packages/nautilus-dropbox/nautilus-dropbox.spec:1.10 --- packages/nautilus-dropbox/nautilus-dropbox.spec:1.9 Thu Jul 8 16:36:29 2010 +++ packages/nautilus-dropbox/nautilus-dropbox.spec Thu Jul 8 20:00:40 2010 @@ -8,6 +8,7 @@ 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 @@ -21,7 +22,6 @@ 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 @@ -36,6 +36,7 @@ %prep %setup -q +%patch0 -p1 %build %configure \ @@ -80,6 +81,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2010/07/08 18:00:40 glen +- find system dropboxd +- drop bogus wget dep + Revision 1.9 2010/07/08 14:36:29 glen - up to 0.6.3 ================================================================ Index: packages/nautilus-dropbox/dropboxd-path.patch diff -u /dev/null packages/nautilus-dropbox/dropboxd-path.patch:1.1 --- /dev/null Thu Jul 8 20:00:45 2010 +++ packages/nautilus-dropbox/dropboxd-path.patch Thu Jul 8 20:00:40 2010 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nautilus-dropbox/nautilus-dropbox.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
