[packages/caja-dropbox] up to 1.7.90

Tue Mar 25 15:31:07 CET 2014

commit 7f9a86de52690f5e5a9d1019ec480f445f9c4241
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 25 16:30:53 2014 +0200

    up to 1.7.90

 caja-dropbox.patch  | 20 --------------------
 caja-dropbox.spec   | 22 ++++++++--------------
 desktop.patch       | 11 +++++++++++
 dropboxd-path.patch | 22 +++++++++++++++-------
 4 files changed, 34 insertions(+), 41 deletions(-)
---

diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index 1c941e1..82c2104 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -1,20 +1,20 @@
 Summary:	Dropbox extension for Caja
 Summary(pl.UTF-8):	Rozszerzenie Dropbox dla Caja
 Name:		caja-dropbox
-Version:	0.7.1
+Version:	1.7.90
 Release:	1
 License:	GPL v2 with exceptions
 Group:		X11/Applications
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-# Source0-md5:	36fb90fe6fa1463c94707565c98c30c7
+Source0:	http://pub.mate-desktop.org/releases/1.7/%{name}-%{version}.tar.xz
+# Source0-md5:	877e610ce51f3cc69d8da2daeb58f61d
 Patch0:		dropboxd-path.patch
-Patch1:		%{name}.patch
+Patch1:		desktop.patch
 Patch2:		caja-versions.patch
 URL:		http://getdropbox.com/
+BuildRequires:	caja-devel >= 1.1.0
 BuildRequires:	glib2-devel >= 1:2.14.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	libnotify-devel >= 0.4.4
-BuildRequires:	mate-file-manager-devel >= 1.1.0
 BuildRequires:	pkgconfig
 BuildRequires:	python-docutils
 BuildRequires:	python-pygtk-devel
@@ -22,7 +22,7 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
-Requires:	mate-file-manager
+Requires:	caja
 Suggests:	python-pygpgme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,11 +43,9 @@ pomiędzy określonymi maszynami.
 %patch2 -p1
 
 %build
-NOCONFIGURE=1 ./autogen.sh
 %configure \
-	--disable-dependency-tracking \
-	--enable-static=no \
-
+	--disable-silent-rules \
+	--disable-static
 %{__make}
 
 %install
@@ -55,10 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_desktopdir}/{,caja-}dropbox.desktop
-mv $RPM_BUILD_ROOT%{_bindir}/{,caja-}dropbox
-%{__sed} -i -e '/Exec=/ s/dropbox/%{name}/' $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0/*.la
 
 %clean
diff --git a/caja-dropbox.patch b/caja-dropbox.patch
deleted file mode 100644
index 48f3bac..0000000
--- a/caja-dropbox.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- caja-dropbox-0.7.1/dropbox.in~	2012-12-23 20:27:53.000000000 +0200
-+++ caja-dropbox-0.7.1/dropbox.in	2012-12-23 20:42:58.817057547 +0200
-@@ -56,7 +56,7 @@
- 
- PARENT_DIR = os.path.expanduser("~")
- DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
--DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop"
-+DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/caja-dropbox.desktop"
- 
- enc = locale.getpreferredencoding()
- 
-@@ -1255,7 +1255,7 @@
-     # UBUNTU
-     if u".config" in contents:
-         autostart_dir = os.path.join(home_dir, u".config", u"autostart")
--        autostart_link = os.path.join(autostart_dir, u"dropbox.desktop")
-+        autostart_link = os.path.join(autostart_dir, u"caja-dropbox.desktop")
-         if should_autostart:
-             if os.path.exists(DESKTOP_FILE):
-                 if not os.path.exists(autostart_dir):
diff --git a/desktop.patch b/desktop.patch
new file mode 100644
index 0000000..87d2ed7
--- /dev/null
+++ b/desktop.patch
@@ -0,0 +1,11 @@
+--- caja-dropbox-1.7.90/data/caja-dropbox.desktop~	2013-08-02 13:08:23.000000000 +0300
++++ caja-dropbox-1.7.90/data/caja-dropbox.desktop	2014-03-25 16:25:28.408526848 +0200
+@@ -3,7 +3,7 @@
+ Name=caja-Dropbox
+ GenericName=File Synchronizer For Mate
+ Comment=Sync your files across computers and to the web
+-Exec=dropbox start -i
++Exec=caja-dropbox start -i
+ Terminal=false
+ Type=Application
+ Icon=caja-dropbox
diff --git a/dropboxd-path.patch b/dropboxd-path.patch
index b9098a2..0f8f717 100644
--- a/dropboxd-path.patch
+++ b/dropboxd-path.patch
@@ -1,14 +1,22 @@
---- 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 @@
+--- caja-dropbox-1.7.90/./caja-dropbox.in~	2013-08-02 13:08:23.000000000 +0300
++++ caja-dropbox-1.7.90/./caja-dropbox.in	2014-03-25 16:12:37.274282401 +0200
+@@ -55,7 +55,9 @@
+ UNPACKING = u"Unpacking Dropbox... %d%%"
+ 
+ PARENT_DIR = os.path.expanduser("~")
+-DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
++DROPBOXD_PATH = "/usr/bin/dropboxd"
++if not os.access(DROPBOXD_PATH , os.X_OK):
++	DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
+ DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop"
+ 
+ enc = locale.getpreferredencoding()
+@@ -699,7 +701,7 @@
      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())
++    db_path = DROPBOXD_PATH
      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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/caja-dropbox.git/commitdiff/7f9a86de52690f5e5a9d1019ec480f445f9c4241

