reduce diff

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=277

subversion.spec

@@ -99,6 +99,11 @@ Requires:       libsqlite3-0 >= %{sqlite_minimum_version}
 Requires(post): %fillup_prereq
 Requires(pre):  pwdutils
 Recommends:     %{name}-bash-completion
+# 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}
 Provides:       subversion-javahl = %{version}-%{release}
 %{?systemd_requires}
 %if %{with all_regression_tests}
@@ -124,11 +129,6 @@ BuildRequires:  libqt4-devel
 Provides:       libsvn_auth_kwallet-1-0 = %{version}
 Obsoletes:      libsvn_auth_kwallet-1-0 < %{version}
 %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,
@@ -196,7 +196,7 @@ Summary:        Apache server module for Subversion server
 Group:          Development/Tools/Version Control
 Requires:       %{apache_mmn}
 Requires:       apache2
-Requires:       subversion%{?mini} = %{version}
+Requires:       subversion = %{version}
 
 %description server
 The subversion-server package adds the Subversion server Apache module