[nemo-dropbox] Fix build for f29 python changes

commit 1eacb5142335a879175a038fcd7c30639600cb60 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Jul 24 20:22:01 2018 +0100 Fix build for f29 python changes nemo-dropbox.spec | 14 +++++++++----- use_python2.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) --- diff --git a/nemo-dropbox.spec b/nemo-dropbox.spec index c99da68..0a6a205 100644 --- a/nemo-dropbox.spec +++ b/nemo-dropbox.spec @@ -1,10 +1,11 @@ Summary: Dropbox extension for nemo Name: nemo-dropbox Version: 3.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ and MIT URL: https://github.com/linuxmint/nemo-extensions Source0: %url/archive/%{version}.tar.gz#/nemo-extensions-%{version}.tar.gz +Patch0: use_python2.patch ExclusiveArch: i686 x86_64 @@ -23,7 +24,7 @@ Dropbox allows you to sync your files online and across your computers automatically. %prep -%setup -q -n nemo-extensions-%{version} +%autosetup -p1 -n nemo-extensions-%{version} %build pushd nemo-dropbox @@ -38,10 +39,10 @@ pushd nemo-dropbox popd #Remove libtool archives. -find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f -rm -rf ${RPM_BUILD_ROOT}%{_bindir} -rm -rf ${RPM_BUILD_ROOT}%{_datadir} +rm -rf %{buildroot}%{_bindir} +rm -rf %{buildroot}%{_datadir} %ldconfig_scriptlets @@ -52,6 +53,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir} %changelog +* Tue Jul 24 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.8.0-2 +- Fix build for f29 python changes + * Tue May 01 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.8.0-1 - Update to 3.8.0 diff --git a/use_python2.patch b/use_python2.patch new file mode 100644 index 0000000..ee5ab46 --- /dev/null +++ b/use_python2.patch @@ -0,0 +1,39 @@ +--- a/nemo-dropbox/configure.ac ++++ b/nemo-dropbox/configure.ac +@@ -29,16 +29,16 @@ + PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_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/nemo-dropbox/Makefile.am ++++ b/nemo-dropbox/Makefile.am + 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 dropbox.txt.in 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 +