diff --git a/subversion.changes b/subversion.changes index 645033c..3c358ed 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 2 19:43:18 UTC 2016 - astieger@suse.com + +- make the subversion package conflict with KWallet and Gnome + Keyring packages with do not require matching subversion versions + in SLE 12 and openSUSE Leap 42.1 and thus break the main package + upon partial upgrade. Fix/workaround for boo#969159 + ------------------------------------------------------------------- Tue Dec 15 16:56:10 UTC 2015 - astieger@suse.com diff --git a/subversion.spec b/subversion.spec index 173f68a..bc9b7ae 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,7 +1,7 @@ # # spec file for package subversion # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Andreas Stieger # Copyright (c) 2009-2010 Pascal Bleser # @@ -121,6 +121,12 @@ BuildRequires: kdelibs4-core BuildRequires: libkde4-devel BuildRequires: libqt4-devel %endif +# workaround for boo#969159 +Conflicts: libsvn_auth_kwallet-1-0 < %{version} +Conflicts: libsvn_auth_kwallet-1-0 > %{version} +Conflicts: libsvn_gnome_keyring-1-0 < %{version} +Conflicts: libsvn_gnome_keyring-1-0 > %{version} +# %description Subversion exists to be universally recognized and adopted as an open-source,