Accepting request 180511 from home:AndreasStieger:branches:devel:tools:scm:svn

- require krb5-devel to fix factory build
- remove unrequired BuildIgnore
- update keyring
- change swig tarball to pristine upstream file

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

subversion.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 21 20:30:57 UTC 2013 - andreas.stieger@gmx.de
+
+- require krb5-devel to fix factory build
+- remove unrequired BuildIgnore
+- update keyring
+- change swig tarball to pristine upstream file
+
 -------------------------------------------------------------------
 Tue Jun 18 00:00:00 UTC 2013 - andreas.stieger@gmx.de
 

subversion.spec

@@ -56,6 +56,7 @@ BuildRequires:  apache2-devel
 BuildRequires:  db-devel
 BuildRequires:  file-devel
 BuildRequires:  gcc-c++
+BuildRequires:  krb5-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -115,14 +116,6 @@ BuildRequires:  junit
 %else
 %define with_java 0
 %endif
-%if 0%{?suse_version} >= 1230
-# 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
@@ -168,15 +161,13 @@ Source14:       svnserve.service
 Source15:       svnserve.tmpfiles
 Source42:       subversion.svngrep.sh
 Source43:       subversion.svndiff.sh
-# https://people.apache.org/keys/group/subversion.asc
+Source50:       https://people.apache.org/keys/group/subversion.asc#/subversion.keyring
-Source50:       subversion.keyring
 Source51:       https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
 %if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
 %endif
 %if %with_intree_swig
-# http://ovh.dl.sourceforge.net/project/swig/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz
+Source90:       http://sourceforge.net/projects/swig/files/swig/swig-%{swig_version}/swig-%{swig_version}.tar.gz
-Source90:       swig-%{swig_version}.tar.bz2
 %else
 BuildRequires:  swig
 %endif

swig-1.3.36.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bfae3308533aa671dd9912612cc59de9109d161efc203d7c58f3ba370f48040a
-size 3705329

swig-1.3.36.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47439796e3332dd6f5f9e2a45a26c5dc2a6bc93461c2e009d7cb493d1816dc1f
+size 4604982