[packages/caja-dropbox] up to 1.22.0

[atler]

commit c043ea41c3dd86d70398af08a27d6c281e469baa
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Mar 19 00:40:38 2019 +0100

    up to 1.22.0

 caja-dropbox.spec      | 22 +++++++++++-----------
 dropboxd-path.patch    | 11 +----------
 python-gpg-pkg.patch   | 11 +++++++++++
 python-gpgme-pkg.patch | 11 -----------
 4 files changed, 23 insertions(+), 32 deletions(-)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index 49ea064..05280a0 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -1,14 +1,14 @@
 Summary:	Dropbox extension for Caja file manager
 Summary(pl.UTF-8):	Rozszerzenie Dropbox dla zarządcy plików Caja
 Name:		caja-dropbox
-Version:	1.20.0
+Version:	1.22.0
 Release:	1
 License:	GPL v3+ (code), CC-BY-ND v3.0 (images)
 Group:		X11/Applications
-Source0:	http://pub.mate-desktop.org/releases/1.20/%{name}-%{version}.tar.xz
-# Source0-md5:	fa026659ae58a48818855b5d8c4da39c
+Source0:	http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
+# Source0-md5:	8cd368c473a6586631cfcfae38c1c436
 Patch0:		dropboxd-path.patch
-Patch1:		python-gpgme-pkg.patch
+Patch1:		python-gpg-pkg.patch
 URL:		http://getdropbox.com/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.9
@@ -18,21 +18,21 @@ BuildRequires:	docutils
 BuildRequires:	glib2-devel >= 1:2.50.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-docutils
-BuildRequires:	python-pygobject >= 2
-BuildRequires:	python-pygtk-gtk >= 2:2
+BuildRequires:	python3
+BuildRequires:	python3-docutils
+BuildRequires:	python3-pygobject3
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
 Requires:	caja >= 1.17.1
 Requires:	glib2 >= 1:2.50.0
-Requires:	python-modules
-Requires:	python-pygtk-gtk >= 2:2
+Requires:	gtk+3
+Requires:	python3-pygobject3
+Requires:	python3-modules
 Requires:	xdg-utils
 Suggests:	dropbox
-Suggests:	python-pygpgme
+Suggests:	python3-gpg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
diff --git a/dropboxd-path.patch b/dropboxd-path.patch
index fda1768..bf0f260 100644
--- a/dropboxd-path.patch
+++ b/dropboxd-path.patch
@@ -8,15 +8,6 @@
 +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@/caja-dropbox.desktop"
+ DESKTOP_FILE = "@DESKTOP_FILE_DIR@/caja-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())
-+    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
diff --git a/python-gpg-pkg.patch b/python-gpg-pkg.patch
new file mode 100644
index 0000000..727fbbc
--- /dev/null
+++ b/python-gpg-pkg.patch
@@ -0,0 +1,11 @@
+--- caja-dropbox-1.7.90/./caja-dropbox.in~	2014-04-06 14:05:59.000000000 +0300
++++ caja-dropbox-1.7.90/./caja-dropbox.in	2014-04-06 14:09:55.077288285 +0300
+@@ -50,7 +50,7 @@
+ INFO = "Dropbox is the easiest way to share and store your files online. Want to learn more? Head to"
+ LINK = "http://www.dropbox.com/"
+ WARNING = "In order to use Dropbox, you must download the proprietary daemon."
+-GPG_WARNING = "Note: python-gpg (python-gpgme for Ubuntu 16.10 and lower) is not installed, we will not be able to verify binary signatures."
++GPG_WARNING = "Note: python3-gpg is not installed, we will not be able to verify binary signatures."
+ ERROR_CONNECTING = "Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable."
+ ERROR_SIGNATURE = "Downloaded binary does not match Dropbox signature, aborting install."
+ 
diff --git a/python-gpgme-pkg.patch b/python-gpgme-pkg.patch
deleted file mode 100644
index 4ced26b..0000000
--- a/python-gpgme-pkg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- caja-dropbox-1.7.90/./caja-dropbox.in~	2014-04-06 14:05:59.000000000 +0300
-+++ caja-dropbox-1.7.90/./caja-dropbox.in	2014-04-06 14:09:55.077288285 +0300
-@@ -50,7 +50,7 @@
- INFO = u"Dropbox is the easiest way to share and store your files online. Want to learn more? Head to"
- LINK = u"http://www.dropbox.com/"
- WARNING = u"In order to use Dropbox, you must download the proprietary daemon."
--GPG_WARNING = u"Note: python-gpgme is not installed, we will not be able to verify binary signatures."
-+GPG_WARNING = u"Note: python-pygpgme is not installed, we will not be able to verify binary signatures."
- ERROR_CONNECTING = u"Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable."
- ERROR_SIGNATURE = u"Downloaded binary does not match Dropbox signature, aborting install."
- 
================================================================

---- gitweb:

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