diff --git a/subversion-1.5.x.tar.bz2 b/subversion-1.5.x.tar.bz2 index 899d0eb..7b9a515 100644 --- a/subversion-1.5.x.tar.bz2 +++ b/subversion-1.5.x.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:471320988fcb959f65899dfa79f7e059a2701120129134ffd1fcb19afe161e67 -size 8614029 +oid sha256:8e4829612c9f6d439eeb89f96f1f76048bc418051de5762cb0d6f16cd8df607f +size 8362951 diff --git a/subversion.allowed-neon.patch b/subversion.allowed-neon.patch index 1ee7d8d..70a3abf 100644 --- a/subversion.allowed-neon.patch +++ b/subversion.allowed-neon.patch @@ -1,17 +1,15 @@ --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) --- a/configure.ac +++ b/configure.ac -@@ -69,8 +69,8 @@ SVN_LIB_APRUTIL($APU_VER_REGEXES) +@@ -69,7 +69,7 @@ SVN_LIB_APRUTIL($APU_VER_REGEXES) # Either a space-separated list of allowable Neon versions, or "any" to # mean allow anything. -NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.2" --NEON_RECOMMENDED_VER=0.25.5 -+NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.0 0.27.1 0.27.2" -+NEON_RECOMMENDED_VER=0.27.0 ++NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.0 0.27.1 0.27.2 0.27.3 0.27.4" + NEON_RECOMMENDED_VER=0.27.2 NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" dnl You can skip the neon version check only if you know what you are doing - AC_ARG_ENABLE(neon-version-check, diff --git a/subversion.changes b/subversion.changes index df57b27..c27f273 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 5 11:40:17 CET 2007 - olh@suse.de + +- update to rev 27593 + allow upcoming neon versions + fix return value in svn_swig_pl_info_receiver() + ------------------------------------------------------------------- Mon Oct 29 11:06:19 CET 2007 - olh@suse.de diff --git a/subversion.spec b/subversion.spec index 74d1a12..98bc183 100644 --- a/subversion.spec +++ b/subversion.spec @@ -19,7 +19,7 @@ BuildRequires: neon-devel %endif BuildRequires: sqlite-devel Version: 1.5.0 -Release: 9 +Release: 12 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -45,6 +45,7 @@ Source12: subversion.sysconfig.svnserve.remoteaccess Source13: subversion.xinetd.svnserve Source42: subversion.svngrep.sh Source43: subversion.svndiff.sh +Patch1: subversion.svn_swig_pl_info_receiver.return.patch # Patch11: subversion.libtool-verbose.patch Patch12: subversion.props.state_pos.patch @@ -132,6 +133,8 @@ case "$swig" in esac %setup -q -n subversion-1.5.x # +%patch1 -p1 +# %patch11 -p1 %patch12 -p1 # @@ -393,6 +396,10 @@ rm -rf $RPM_BUILD_ROOT %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* %changelog +* Mon Nov 05 2007 - olh@suse.de +- update to rev 27593 + allow upcoming neon versions + fix return value in svn_swig_pl_info_receiver() * Mon Oct 29 2007 - olh@suse.de - update to rev 27452 reenable javahl diff --git a/subversion.svn_swig_pl_info_receiver.return.patch b/subversion.svn_swig_pl_info_receiver.return.patch new file mode 100644 index 0000000..f56d1fd --- /dev/null +++ b/subversion.svn_swig_pl_info_receiver.return.patch @@ -0,0 +1,15 @@ +--- + subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c ++++ b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c +@@ -1155,7 +1155,7 @@ svn_error_t *svn_swig_pl_info_receiver(v + swig_type_info *infoinfo = _SWIG_TYPE("svn_info_t *"); + + if (!SvOK((SV *)baton)) +- return; ++ return SVN_NO_ERROR; + + svn_swig_pl_callback_thunk(CALL_SV, baton, &result, "sSS", path, info, + infoinfo, pool, POOLINFO);