diff --git a/subversion-1.7.4-ruby-1.9-RbConfig.patch b/subversion-1.7.4-ruby-1.9-RbConfig.patch new file mode 100644 index 0000000..e8ce788 --- /dev/null +++ b/subversion-1.7.4-ruby-1.9-RbConfig.patch @@ -0,0 +1,32 @@ +Index: build/ac-macros/swig.m4 +=================================================================== +--- build/ac-macros/swig.m4.orig 2012-05-11 22:37:59.000000000 +0100 ++++ build/ac-macros/swig.m4 2012-05-11 22:38:27.000000000 +0100 +@@ -187,7 +187,7 @@ AC_DEFUN(SVN_FIND_SWIG, + for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ + rubyhdrdir sitedir sitelibdir sitearchdir libdir + do +- rbconfig_tmp=`$rbconfig "print Config::CONFIG@<:@'$var_name'@:>@"` ++ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"` + eval "rbconfig_$var_name=\"$rbconfig_tmp\"" + done + +Index: configure.ac +=================================================================== +--- configure.ac.orig 2012-05-11 22:37:59.000000000 +0100 ++++ configure.ac 2012-05-11 22:55:02.000000000 +0100 +@@ -1121,12 +1121,12 @@ if test "$RUBY" != "none"; then + AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none) + fi + AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[ +- svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`" ++ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`" + ]) + RUBY_MAJOR="$svn_cv_ruby_major" + + AC_CACHE_CHECK([for Ruby minor version], [svn_cv_ruby_minor],[ +- svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'`" ++ svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MINOR))'`" + ]) + RUBY_MINOR="$svn_cv_ruby_minor" + diff --git a/subversion-1.7.4.tar.bz2 b/subversion-1.7.4.tar.bz2 deleted file mode 100644 index 9b4467f..0000000 --- a/subversion-1.7.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f -size 5978020 diff --git a/subversion-1.7.5.tar.bz2 b/subversion-1.7.5.tar.bz2 new file mode 100644 index 0000000..aadb11b --- /dev/null +++ b/subversion-1.7.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec +size 6002955 diff --git a/subversion.changes b/subversion.changes index 309e4fe..57d43fe 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Mon May 21 19:58:48 UTC 2012 - andreas.stieger@gmx.de + +- Allow unit tests to be run for Factory: --with=regression_tests + replacing the inline conditional + +------------------------------------------------------------------- +Thu May 17 00:00:00 UTC 2012 - andreas.stieger@gmx.de + +- update to upstream 1.7.5 + + User-visible changes: + - Client- and server-side bugfixes: + * http: report deleted-revision upon delete during update + + - Client-side bugfixes: + * avoid potential segfault when canonicalizing properties + * improve memory and file-handle management with externals (issue #4130) + * serf: convert assertions to "MERGE failed" errors + * fix undefined behaviour during multi-segment reverse merges (issue #4144) + * fix potential use of already freed memory during diff operation + * improve performance of scan for the working copy root + * cmdline: fix segfault during 'svn diff' argument processing + * fix regression from 1.6 in update with --depth option (issue #4136) + * propset: avoid undefined behaviour in error path + * reset sqlite statements, partly for sqlite-3.7.11 compat + * fix assertion during 'svn diff -r BASE:HEAD ^/trunk' (issue #4161) + * notify upon 'update' just removing locks on files + * neon: fix potential use of freed memory during commits + * 'status --xml' doesn't show repository deletes correctly (issue #4167) + * fix assert on svn:externals with drive letter on Windows (issue #4073) + * fix 'svn update --depth=empty' against 1.4 servers (issue #4046) + * handle missing svn:date reported by svnserve gracefully + * fix merges which first add a subtree and then delete it (issue #4166) + * fix a regression with checkout of file externals (issue #4087) + * don't add spurious mergeinfo to subtrees in edge-case merge (issue #4169) + * improve performance of status on large working copies (issue #4178) + + - Server-side bugfixes: + * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129) + * mod_dav_svn: raise an error on MERGE of non-existent resource + * mod_dav_svn: support compiling/running under httpd-2.4 (r1232267) + * mod_dav_svn: forbid BDB repositories under httpd's event MPM (issue #4157) + + - Other tool improvements and bugfixes: + * emacs support: updates to dsvn.el and vc-svn.el + + Developer-visible changes: + - General: + * windows example distribution scripts: include svnrdump + * fix running the test suite with jsvn + + - Bindings: + * swig-py tests: avoid FAILs on APR hash order + * swig-rb tests: avoid FAILs on APR hash order + * swig-pl: Improved perl detection in gen-make.py + +------------------------------------------------------------------- +Fri May 11 22:31:27 UTC 2012 - andreas.stieger@gmx.de + +- Subversion currently does not compile Ruby bindings for 1.9 + disable to fix build in Factory +- add subversion-1.7.4-ruby-1.9-RbConfig.patch to use RbConfig + instead of Config which is deprecated in Ruby 1.9 +- fix conditional configuration for serf support +- add check that ra_serf is built as configure failed silently + ------------------------------------------------------------------- Thu Mar 8 00:00:00 UTC 2012 - andreas.stieger@gmx.de diff --git a/subversion.spec b/subversion.spec index 4bf5432..3d90e34 100644 --- a/subversion.spec +++ b/subversion.spec @@ -17,7 +17,8 @@ # -%define with_ruby 0%{?suse_version} > 1110 +# Subversion as of 1.7.4 does not work with ruby 1.9 in Factory +%define with_ruby 0%{?suse_version} > 1110 && 0%{?suse_version} < 1220 %define with_intree_swig 0%{?suse_version} != 1110 %if 0%{?always_use_intree_sqlite:1} %define with_intree_sqlite 1 @@ -32,13 +33,15 @@ %define with_kde4_kwallet 0%{?suse_version} > 1100 %define with_gnome_keyring 0%{?suse_version} > 1100 -%if %suse_version >= 1210 -%bcond_with subversion_libserf_support -%else -%bcond_without subversion_libserf_support -%endif +%bcond_without serf +# do not run regression tests for Factory, unless --with=regression_tests +%if 0%{?suse_version} > 1210 +%bcond_with regression_tests +%else +# run regression tests for previous releases, unless --without=regression_tests %bcond_without regression_tests +%endif # suse_version %if 0%{?sles_version} > 10 && 0%{?sles_version} < 12 %define with_bashcomp 0 @@ -47,7 +50,7 @@ %endif Name: subversion -Version: 1.7.4 +Version: 1.7.5 Release: 0 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 @@ -84,7 +87,7 @@ BuildRequires: libgnome-keyring-devel BuildRequires: gnome-keyring-devel %endif %endif # with_gnome_keyring -%if %{with subversion_libserf_support} +%if %{with serf} BuildRequires: libserf-devel %endif %if %with_kde4_kwallet @@ -160,6 +163,8 @@ Patch31: subversion.perl.LD_RUN_PATH.patch Patch37: subversion-no-build-date.patch # PATCH-FEATURE-UPSTREAM subversion-neon-systemproxy.patch dimstar@opensuse.org -- Use system proxy offered by neon, if no specific config is used (Thus, actually using libproxy in the background to use 'the right proxy' as configured in the system). Patch38: subversion-neon-systemproxy.patch +# PATCH-FIX-UPSTREAM subversion-1.7.4-ruby-1.9-RbConfig.patch andreas.stieger@gmx.de -- Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config" +Patch39: subversion-1.7.4-ruby-1.9-RbConfig.patch # %if %with_ruby %if %{!?rb_arch:1}0 @@ -208,9 +213,9 @@ repository admins. %package perl Summary: Allows Perl scripts to directly use Subversion repositories Group: Development/Tools/Version Control -Requires: subversion = %{version} -Requires: perl >= 5.8 Requires: perl = %{perl_version} +Requires: perl >= 5.8 +Requires: subversion = %{version} %description perl Provides Perl (SWIG) support for Subversion. @@ -332,6 +337,7 @@ popd #./sqlite-amalgamation %patch31 %patch37 %patch38 +%patch39 SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") #" @@ -454,7 +460,9 @@ export PATH="${SWIG_ROOT}/bin:${PATH}" %configure \ --with-editor="vim -c 'set tw=72 et' " \ --with-neon=%{_prefix} \ - %{?_with_subversion_libserf_support} \ +%if %{with serf} + --with-serf=%{_prefix} \ +%endif --with-apr=%{_prefix} \ --with-apr-util=%{_prefix} \ --with-apxs=%{apxs} \ @@ -532,6 +540,18 @@ http https svn" # +%if %{with serf} +# +# double check that when building with serf support, ra_serf is actually available and handles http and https schemes +# +serf_schemes=$(LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}" "${RPM_BUILD_ROOT}%{_bindir}/svn" --version | %__grep -A2 "ra_serf" | %__grep "'" | cut -d\' -f2 ) +# reset vim syntax: ' +test "$serf_schemes" = "http +https" +# +%endif # with serf +# + %perl_process_packlist %find_lang %name # @@ -584,7 +604,6 @@ rm -f %{buildroot}/var/adm/perl-modules/subversion %if %{with regression_tests} -%if 0%{?suse_version} < 1220 ulimit -a # During "make check", auth-test loads DSOs at runtime and can't find # them if we don't set up LD_LIBRARY_PATH as below. @@ -633,8 +652,6 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %__make check-swig-rb %endif # with_ruby -%endif # suse_version - %endif # with regression_tests %clean