commit 905c3a11fbf4dd9d52078b686aa4dfe423fd38e2 Author: Leigh Scott <leigh123linux(a)googlemail.com&gt; Date: Fri Dec 7 12:02:27 2018 +0000 Updated to 2018.11.28 .gitignore | 3 +- nautilus-dropbox.spec | 12 ++-- sources | 2 +- switch_to_python-gpg.patch | 139 --------------------------------------------- use_python2.patch | 6 +- 5 files changed, 12 insertions(+), 150 deletions(-) --- diff --git a/.gitignore b/.gitignore index fcad926..2447dfa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -nautilus-dropbox-2.10.0.tar.bz2 -/nautilus-dropbox-2015.10.28.tar.bz2 +nautilus-dropbox-*.tar.bz2 diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec index a4e6546..d2ed536 100644 --- a/nautilus-dropbox.spec +++ b/nautilus-dropbox.spec @@ -1,7 +1,7 @@ Name: nautilus-dropbox Epoch: 1 -Version: 2015.10.28 -Release: 9%{?dist} +Version: 2018.11.28 +Release: 1%{?dist} Summary: Dropbox extension for Nautilus License: GPLv3+ URL: https://www.dropbox.com @@ -10,14 +10,13 @@ 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 -# Based on https://github.com/dropbox/nautilus-dropbox/commit/e9367206f9b723103362e8... -Patch2: switch_to_python-gpg.patch ExclusiveArch: i686 x86_64 BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: libtool +BuildRequires: gcc BuildRequires: nautilus-devel BuildRequires: python2-docutils BuildRequires: pygobject2-devel @@ -57,7 +56,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop %ldconfig_scriptlets %files -n dropbox -%doc ChangeLog README +%doc ChangeLog %license COPYING %{_bindir}/dropbox %{_datadir}/nautilus-dropbox/ @@ -69,6 +68,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop %{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so %changelog +* Fri Dec 07 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:2018.11.28-1 +- Updated to 2018.11.28 + * Tue Sep 25 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:2015.10.28-9 - Add upstream commit to switch to python2-gpg (rfbz#5032) diff --git a/sources b/sources index 4c7e35f..81eab39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1d0832b4af2998ad7094bdfe1f5c300 nautilus-dropbox-2015.10.28.tar.bz2 +2812bc21e5dbfd8cb854ac68fb556c77 nautilus-dropbox-2018.11.28.tar.bz2 diff --git a/use_python2.patch b/use_python2.patch index 8cfbab5..6f4942d 100644 --- a/use_python2.patch +++ b/use_python2.patch @@ -1,5 +1,5 @@ ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -29,16 +29,16 @@ PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) @@ -24,7 +24,7 @@ --- a/dropbox.in +++ b/dropbox.in @@ -1,4 +1,4 @@ --#!/usr/bin/python +-#!/usr/bin/env python2 +#!/usr/bin/python2 # # Copyright (c) Dropbox, Inc.