Hello community, here is the log from the commit of package kdesvn for openSUSE:Factory checked in at 2016-01-28 17:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesvn (Old) and /work/SRC/openSUSE:Factory/.kdesvn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesvn" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesvn/kdesvn.changes 2015-10-12 10:03:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesvn.new/kdesvn.changes 2016-01-28 17:26:01.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Jan 28 13:34:00 UTC 2016 - [email protected] + +- Only recommend the kio_svn instead of require it. On Tumbleweed + the kio_svn is not building due to upstream changes of SVN itself. + +------------------------------------------------------------------- +Tue Dec 29 12:34:00 UTC 2015 - [email protected] + +- Added KDE-BUG-357297-Run-ssh-add-every-time.patch, fix + running ssh-add every time (kde#357297). + +------------------------------------------------------------------- New: ---- KDE-BUG-357297-Run-ssh-add-every-time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesvn.spec ++++++ --- /var/tmp/diff_new_pack.Ca4lzc/_old 2016-01-28 17:26:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Ca4lzc/_new 2016-01-28 17:26:02.000000000 +0100 @@ -30,12 +30,14 @@ Patch1: fix_crash_when_getting_logs.patch # PATCH-FIX_UPSTREAM let-kdelibs-create-uninstall-target.patch -- fix build when CMake's CMP002 policy is set to NEW (with kdelibs4 >= 4.14.11) Patch2: let-kdelibs-create-uninstall-target.patch +# PATCH-FIX_UPSTREAM kde#357297 +Patch3: KDE-BUG-357297-Run-ssh-add-every-time.patch BuildRequires: fdupes BuildRequires: libkde4-devel BuildRequires: openldap2-devel BuildRequires: sqlite3-devel BuildRequires: subversion-devel -Requires: kio_svn +Recommends: kio_svn Provides: kde4-kdesvn = %{version} Obsoletes: kde4-kdesvn < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +68,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake_kde4 -d build ++++++ KDE-BUG-357297-Run-ssh-add-every-time.patch ++++++ diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp index 7c69b03..2fc3eae 100644 --- a/src/helpers/sshagent.cpp +++ b/src/helpers/sshagent.cpp @@ -124,7 +124,7 @@ bool SshAgent::addSshIdentities(bool force) } - if( !m_isRunning || (!m_isOurAgent&&!force)) { + if( !m_isRunning) { return false; }
