up to 1.26.0

- require glib2 >= 2.68 for g_memdup2

diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index e56151c658fcb1ee52512a03f0dc8d722e8fb05a..fa8176970d8124f8a7b81c73e9352625014c6c0f 100644 (file)
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -1,12 +1,12 @@
 Summary:       Dropbox extension for Caja file manager
 Summary(pl.UTF-8):     Rozszerzenie Dropbox dla zarządcy plików Caja
 Name:          caja-dropbox
-Version:       1.24.0
+Version:       1.26.0
 Release:       1
 License:       GPL v3+ (code), CC-BY-ND v3.0 (images)
 Group:         X11/Applications
-Source0:       http://pub.mate-desktop.org/releases/1.24/%{name}-%{version}.tar.xz
-# Source0-md5: 0904ce2ca9d7205c9b39bf61a009a6cb
+Source0:       https://pub.mate-desktop.org/releases/1.26/%{name}-%{version}.tar.xz
+# Source0-md5: 91a4a5e8b04fe7a710db07882b944405
 Patch0:                dropboxd-path.patch
 Patch1:                python-gpg-pkg.patch
 URL:           http://getdropbox.com/
@@ -15,6 +15,7 @@ BuildRequires:        automake >= 1:1.9
 BuildRequires: caja-devel >= 1.17.1
 # rst2man
 BuildRequires: docutils
+BuildRequires: gettext-tools >= 0.19.8
 BuildRequires: glib2-devel >= 1:2.50.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
@@ -23,6 +24,8 @@ BuildRequires:        python3-docutils
 BuildRequires: python3-pygobject3
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
 Requires:      caja >= 1.17.1

diff --git a/dropboxd-path.patch b/dropboxd-path.patch
index bf0f26048145f01bfdf8abf5384cb8a17000d856..1e82e2b1659c82cc317d00d22e72513ae9f42c2e 100644 (file)
--- a/dropboxd-path.patch
+++ b/dropboxd-path.patch
@@ -1,7 +1,7 @@
 --- caja-dropbox-1.8.0/./caja-dropbox.in~      2014-08-11 20:06:44.000000000 +0300
 +++ caja-dropbox-1.8.0/./caja-dropbox.in       2014-08-11 20:09:13.478183272 +0300
 @@ -61,7 +61,9 @@
- UNPACKING = u"Unpacking Dropbox... %d%%"
+ UNPACKING = _("Unpacking Dropbox... %d%%")
  
  PARENT_DIR = os.path.expanduser("~")
 -DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR

diff --git a/python-gpg-pkg.patch b/python-gpg-pkg.patch
index 727fbbce230aaa745f3ad26fe5a66e58641699c1..5d56c0d19d22475aa8e4663e64544d93315a939b 100644 (file)
--- a/python-gpg-pkg.patch
+++ b/python-gpg-pkg.patch
@@ -1,11 +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."
- 
+ INFO = _("Dropbox is the easiest way to share and store your files online. Want to learn more? Head to")
+ LINK = "https://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.")
+ ERROR_INVALID_DROPBOX = _("Could not start the Dropbox daemon. Make sure your computer meets the minimum requirements:\nhttps://www.dropbox.com/help/desktop-web/system-requirements#desktop")