9:10 a.m.
commit c2c10fcbdd11def7478e8b5452462cb724f4d20f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Feb 12 09:09:57 2019 +0000
Updated to 2019.01.31
fix_nautilus_includes.patch | 39 +++
nautilus-dropbox.spec | 22 +-
...ox_0002-Use-GIR-bindings-instead-of-pygtk.patch | 278 ---------------------
python3-docutils_fix.patch | 20 ++
sources | 2 +-
use_python2.patch | 58 -----
6 files changed, 73 insertions(+), 346 deletions(-)
---
diff --git a/fix_nautilus_includes.patch b/fix_nautilus_includes.patch
new file mode 100644
index 0000000..7623eb7
--- /dev/null
+++ b/fix_nautilus_includes.patch
@@ -0,0 +1,39 @@
+diff -uNrp a/src/dropbox-command-client.h b/src/dropbox-command-client.h
+--- a/src/dropbox-command-client.h 2019-01-10 01:12:50.000000000 +0000
++++ b/src/dropbox-command-client.h 2019-02-12 08:52:27.443189961 +0000
+@@ -24,8 +24,7 @@
+ #ifndef DROPBOX_COMMAND_CLIENT_H
+ #define DROPBOX_COMMAND_CLIENT_H
+
+-#include <libnautilus-extension/nautilus-info-provider.h>
+-#include <libnautilus-extension/nautilus-file-info.h>
++#include <nautilus-extension.h>
+
+ G_BEGIN_DECLS
+
+diff -uNrp a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
+--- a/src/nautilus-dropbox.c 2019-01-10 01:12:50.000000000 +0000
++++ b/src/nautilus-dropbox.c 2019-02-12 08:51:10.385813888 +0000
+@@ -37,9 +37,7 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+
+-#include <libnautilus-extension/nautilus-extension-types.h>
+-#include <libnautilus-extension/nautilus-menu-provider.h>
+-#include <libnautilus-extension/nautilus-info-provider.h>
++#include <nautilus-extension.h>
+
+ #include "g-util.h"
+ #include "dropbox-command-client.h"
+diff -uNrp a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h
+--- a/src/nautilus-dropbox.h 2019-01-10 01:12:50.000000000 +0000
++++ b/src/nautilus-dropbox.h 2019-02-12 08:51:57.680430947 +0000
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+
+-#include <libnautilus-extension/nautilus-info-provider.h>
++#include <nautilus-extension.h>
+
+ #include "dropbox-command-client.h"
+ #include "nautilus-dropbox-hooks.h"
diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index a54bcb4..a7eae6a 100644
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -1,7 +1,7 @@
Name: nautilus-dropbox
Epoch: 1
-Version: 2018.11.28
-Release: 2%{?dist}
+Version: 2019.01.31
+Release: 1%{?dist}
Summary: Dropbox extension for Nautilus
License: GPLv3+
URL: https://www.dropbox.com
@@ -9,9 +9,8 @@ Source:
https://linux.dropbox.com/packages/%{name}-%{version}.tar.bz2
# add 10 second delay to autostart to ensure it loads on session startup
Patch0: add_startup_delay.patch
-Patch1: use_python2.patch
-# https://github.com/dropbox/nautilus-dropbox/pull/57
-Patch2: nautilus-dropbox_0002-Use-GIR-bindings-instead-of-pygtk.patch
+Patch1: python3-docutils_fix.patch
+Patch2: fix_nautilus_includes.patch
ExclusiveArch: i686 x86_64
@@ -20,8 +19,8 @@ BuildRequires: desktop-file-utils
BuildRequires: libtool
BuildRequires: gcc
BuildRequires: nautilus-devel
-BuildRequires: python2-docutils
-BuildRequires: pygobject3-devel
+BuildRequires: python3-docutils
+BuildRequires: python3-gobject
Requires: dropbox >= %{?epoch}:%{version}-%{release}
%description
@@ -30,8 +29,8 @@ Dropbox extension for nautilus file manager
%package -n dropbox
Summary: Client for Linux
BuildArch: noarch
-Requires: python2-gobject
-Requires: python2-gpg
+Requires: python3-gobject
+Requires: python3-gpg
%description -n dropbox
Dropbox allows you to sync your files online and across
@@ -68,6 +67,11 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/dropbox.desktop
%changelog
+* Tue Feb 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:2019.01.31-1
+- Updated to 2019.01.31
+- Fix nautilus includes
+- Fix python3-docutils
+
* Sun Jan 06 2019 Wolfgang Ulbrich <fedora(a)raveit.de> - 1:2018.11.28-2
- add upstream patch, port pygtk2 to pygobject-introspection
diff --git a/python3-docutils_fix.patch b/python3-docutils_fix.patch
new file mode 100644
index 0000000..bd442fa
--- /dev/null
+++ b/python3-docutils_fix.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,14 +32,14 @@
+ AC_PATH_PROG([PYTHON], [python])
+ AC_PATH_PROG([PYTHON3], [python3])
+
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
+ AC_SUBST(RST2MAN)
+
+ # define module checking macro
+ AC_DEFUN([PYTHON_CHECK_MODULE], [
+ AC_MSG_CHECKING([for $1])
+
+-cat <<EOF | python
++cat <<EOF | python3
+ try:
+ import $2
+ except:
+
diff --git a/sources b/sources
index 81eab39..3eb41ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2812bc21e5dbfd8cb854ac68fb556c77 nautilus-dropbox-2018.11.28.tar.bz2
+61a53264bf92b3b96f6a28cd616c68d6 nautilus-dropbox-2019.01.31.tar.bz2