From 4eac9dafa3ceb4bca69cb13fc7b9cf045efb319c8eb7d4e1ef84de921d65ba6d Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 18 Jun 2013 15:19:10 +0000 Subject: [PATCH] Accepting request 179586 from home:AndreasStieger:branches:devel:tools:scm:svn resolve krb5 in factory OBS-URL: https://build.opensuse.org/request/show/179586 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=129 --- subversion.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/subversion.spec b/subversion.spec index 45c3612..be7c42f 100644 --- a/subversion.spec +++ b/subversion.spec @@ -119,6 +119,10 @@ BuildRequires: junit # fix "have choice for libjpeg-devel needed by libmng-devel: libjpeg62-devel libjpeg8-devel" #!BuildIgnore: libjpeg62-devel %endif +%if 0%{?suse_version} >= 1310 +# fix unresolvable: conflict for provider of krb5 = 1.11.3 needed by krb5-devel, (provider krb5 is conflicted by installed krb5-mini) +#!BuildIgnore: krb5-mini +%endif %if %{with regression_tests} # svnserveautocheck.sh davautocheck.sh requirements BuildRequires: net-tools