commit b7fa23f3fd1bfef9230117bb7be712c8bfc7a602 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Jul 24 17:22:35 2018 +0100 fix python2 build issue nautilus-dropbox.spec | 3 +++ use_python2.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) --- diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec index 5081be0..7b88940 100644 --- a/nautilus-dropbox.spec +++ b/nautilus-dropbox.spec @@ -9,6 +9,7 @@ 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 ExclusiveArch: i686 x86_64 @@ -38,6 +39,7 @@ your computers automatically. %prep %autosetup -p1 +autoreconf -fiv %build %configure --disable-static @@ -68,6 +70,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop * Tue Jul 24 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:2015.10.28-7 - Fix directory ownership (rfbz#4975) - Fix scriptlets +- Fix build for f29 python changes * Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 1:2015.10.28-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/use_python2.patch b/use_python2.patch new file mode 100644 index 0000000..8cfbab5 --- /dev/null +++ b/use_python2.patch @@ -0,0 +1,58 @@ +--- a/configure.in ++++ b/configure.in +@@ -29,16 +29,16 @@ + PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) + +-AC_PATH_PROG([PYTHON], [python]) ++AC_PATH_PROG([PYTHON], [python2]) + +-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py]) ++AC_PATH_PROG([RST2MAN], [rst2man], [python2 rst2man.py]) + AC_SUBST(RST2MAN) + + # define module checking macro + AC_DEFUN([PYTHON_CHECK_MODULE], [ + AC_MSG_CHECKING([for $1]) + +-cat <<EOF | python ++cat <<EOF | python2 + try: + import $2 + except: + +--- a/dropbox.in ++++ b/dropbox.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (c) Dropbox, Inc. + # + +--- a/rst2man.py ++++ b/rst2man.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + + # Author: + # Contact: grubert(a)users.sf.net + +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,11 +6,11 @@ + man_MANS = dropbox.1 + + dropbox: dropbox.in serializeimages.py +- python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox ++ python2 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox + chmod +x dropbox + + dropbox.1: dropbox.txt.in dropbox docgen.py +- python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt ++ python2 docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt + $(RST2MAN) dropbox.txt > dropbox.1 + + SUBDIRS = data src +