commit d7ac824a16ffa3637c94791d7e25b48d63fe4245 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Jul 24 20:32:59 2018 +0100 Fix build for f29 python changes caja-dropbox.spec | 25 ++++++++++++++----------- use_python2.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 11 deletions(-) --- diff --git a/caja-dropbox.spec b/caja-dropbox.spec index 569dfce..e6cb6e8 100644 --- a/caja-dropbox.spec +++ b/caja-dropbox.spec @@ -4,11 +4,12 @@ Summary: Dropbox extension for caja Name: caja-dropbox Version: %{branch}.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://git.mate-desktop.org/%{name} Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz +Patch0: use_python2.patch ExclusiveArch: i686 x86_64 @@ -34,33 +35,35 @@ Dropbox allows you to sync your files online and across your computers automatically. %prep -%setup -q +%autosetup -p1 +autoreconf -fiv %build %configure -make %{?_smp_mflags} +%{make_build} %install %{make_install} -find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec 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} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc AUTHORS COPYING NEWS README +%doc AUTHORS NEWS README +%license COPYING %{_libdir}/caja/extensions-2.0/libcaja-dropbox.so %changelog +* Tue Jul 24 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.20.0-2 +- Fix build for f29 python changes + * Mon May 02 2018 Wolfgang Ulbrich <fedora(a)raveit.de&gt; - 1.20.0-1 - update to 1.20.0 diff --git a/use_python2.patch b/use_python2.patch new file mode 100644 index 0000000..46fa215 --- /dev/null +++ b/use_python2.patch @@ -0,0 +1,39 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -29,16 +29,16 @@ + PKG_CHECK_MODULES(CAJA, libcaja-extension >= $CAJA_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/Makefile.am ++++ b/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 +