[nautilus-dropbox] fix python2 build issue
by Leigh Scott
commit b7fa23f3fd1bfef9230117bb7be712c8bfc7a602
Author: leigh123linux <leigh123linux(a)googlemail.com>
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> - 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> - 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
+
6 years, 4 months
[nautilus-dropbox] fix icon name
by Leigh Scott
commit 137446d77c6e268c1d95e222616ef4cfe1bfffd6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 24 15:31:21 2018 +0100
fix icon name
nautilus-dropbox.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index defe63c..5081be0 100644
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -57,7 +57,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop
%license COPYING
%{_bindir}/dropbox
%{_datadir}/nautilus-dropbox/
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/dropbox.png
%{_mandir}/man1/dropbox.1.*
%{_datadir}/applications/dropbox.desktop
6 years, 4 months
[nautilus-dropbox] Fix directory ownership (rfbz#4975)
by Leigh Scott
commit 4bfc8ea75cc5abc4a8d6dc7e9349cb56a22c3a07
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 24 14:12:36 2018 +0100
Fix directory ownership (rfbz#4975)
nautilus-dropbox.spec | 35 ++++++++++++-----------------------
1 file changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index 94e4d12..defe63c 100644
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -1,7 +1,7 @@
Name: nautilus-dropbox
Epoch: 1
Version: 2015.10.28
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Dropbox extension for Nautilus
License: GPLv3+
URL: https://www.dropbox.com
@@ -12,11 +12,11 @@ Patch0: add_startup_delay.patch
ExclusiveArch: i686 x86_64
+BuildRequires: automake
BuildRequires: desktop-file-utils
+BuildRequires: libtool
BuildRequires: nautilus-devel
BuildRequires: python2-docutils
-BuildRequires: automake
-BuildRequires: libtool
BuildRequires: pygobject2-devel
BuildRequires: pygtk2-devel
Requires: dropbox >= %{?epoch}:%{version}-%{release}
@@ -37,8 +37,7 @@ your computers automatically.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
%build
%configure --disable-static
@@ -46,33 +45,19 @@ your computers automatically.
%install
%{make_install}
-find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.la' -delete -print
+find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/dropbox.desktop
-
-%post -p /sbin/ldconfig
+desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop
-%postun -p /sbin/ldconfig
-
-%post -n dropbox
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun -n dropbox
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans -n dropbox
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%ldconfig_scriptlets
%files -n dropbox
%doc ChangeLog README
%license COPYING
%{_bindir}/dropbox
%{_datadir}/nautilus-dropbox/
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/dropbox.1.*
%{_datadir}/applications/dropbox.desktop
@@ -80,6 +65,10 @@ fi
%{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so
%changelog
+* Tue Jul 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:2015.10.28-7
+- Fix directory ownership (rfbz#4975)
+- Fix scriptlets
+
* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1:2015.10.28-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 4 months
[chromium-freeworld] Do not autorebuild: Release needs to match the Fedora's one
by Miro Hrončok
commit 568203da5f8130def2511a3b8e6a64ec8bcf4d77
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Jul 24 14:03:48 2018 +0200
Do not autorebuild: Release needs to match the Fedora's one
noautobuild | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/noautobuild b/noautobuild
new file mode 100644
index 0000000..00ca33e
--- /dev/null
+++ b/noautobuild
@@ -0,0 +1 @@
+Release needs to match the Fedora's one
6 years, 4 months
