Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nautilus-dropbox for
openSUSE:Factory checked in at 2021-03-19 16:43:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nautilus-dropbox (Old)
and /work/SRC/openSUSE:Factory/.nautilus-dropbox.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus-dropbox"
Fri Mar 19 16:43:39 2021 rev:16 rq:880092 version:2020.03.04
Changes:
--------
--- /work/SRC/openSUSE:Factory/nautilus-dropbox/nautilus-dropbox.changes
2021-01-13 18:36:31.802353905 +0100
+++
/work/SRC/openSUSE:Factory/.nautilus-dropbox.new.2401/nautilus-dropbox.changes
2021-03-19 16:43:40.422152096 +0100
@@ -1,0 +2,9 @@
+Thu Feb 18 17:44:02 UTC 2021 - Dominique Leuenberger <[email protected]>
+
+- Add 98.patch: workaround build script not coping with the new
+ GNOME versioning scheme. In case of x.alpha or x.beta version, we
+ declare them as x.0.
+- Add libtool BuildRequires and call to autoreconf, as above patch
+ touches the build system.
+
+-------------------------------------------------------------------
New:
----
98.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus-dropbox.spec ++++++
--- /var/tmp/diff_new_pack.7eQpmq/_old 2021-03-19 16:43:40.842152447 +0100
+++ /var/tmp/diff_new_pack.7eQpmq/_new 2021-03-19 16:43:40.850152454 +0100
@@ -26,6 +26,9 @@
Group: Productivity/File utilities
URL: https://www.dropbox.com
Source:
https://www.dropbox.com/download?dl=packages/%{name}-%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE 98.patch [email protected] -- Hack together something
to accept GNOME 40 version schemes
+Patch0:
https://patch-diff.githubusercontent.com/raw/dropbox/nautilus-dropbox/pull/98.patch
+BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: gobject-introspection
BuildRequires: python3-docutils
@@ -66,6 +69,8 @@
%autosetup -p1
%build
+# Needed for patch0
+autoreconf -fiv
%configure \
--disable-static \
%{nil}
++++++ 98.patch ++++++
>From 7663ee00906b1adbde980c96b661c6b79478efa4 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <[email protected]>
Date: Thu, 18 Feb 2021 18:55:51 +0100
Subject: [PATCH] build: handle (in some way) the new GNOME versioning scheme
With GNOME switching from odd/even versioning for unsstable/stable
branches to 40.alpha, 40.beta, we need to trick the versioning to
our liking.
In case NAUTILUS_VERSION_MINOR contains letters, we reset it to 0.
This means we treat 40.alpha as 40.0 (as if it was the final release of the 40
series)
Fixes issue#97
---
configure.ac | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index d3f75ee..025289c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,11 @@ NAUTILUS_VERSION=`$PKG_CONFIG --modversion
libnautilus-extension`
if test -n "$NAUTILUS_VERSION"; then
NAUTILUS_VERSION_MAJOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 1`
NAUTILUS_VERSION_MINOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 2`
+ case "$NAUTILUS_VERSION_MINOR" in
+ *[[a-zA-Z]]* )
+ NAUTILUS_VERSION_MINOR=0
+ ;;
+ esac
NAUTILUS_VERSION_MICRO=`echo -n $NAUTILUS_VERSION | cut -d . -f 3`
fi
