- swig-perl test suite fix for Perl 5.10 (upstream r31546)

This commit is contained in:
jorton 2008-07-02 07:17:34 +00:00
parent 6e456b948d
commit dd588d089d
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,15 @@
upstream r31546
--- subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t.perl510
+++ subversion-1.5.0/subversion/bindings/swig/perl/native/t/6ra.t
@@ -221,8 +221,7 @@ sub add_file {
sub apply_textdelta {
my ($self, $baton, $base_checksum, $pool) = @_;
- my $data = $baton->{data} = \'';
- open my $out_fh, '>', $data
+ open my $out_fh, '>', \$baton->{data}
or die "error opening in-memory file to store Subversion update: $!";
open my $in_fh, '<', \''
or die "error opening in-memory file for delta source: $!";

View File

@ -15,7 +15,7 @@
Summary: Modern Version Control System designed to replace CVS
Name: subversion
Version: 1.5.0
Release: 3
Release: 4
License: ASL 1.1
Group: Development/Tools
URL: http://subversion.tigris.org/
@ -27,6 +27,7 @@ Patch2: subversion-0.20.1-deplibs.patch
Patch3: subversion-0.31.0-rpath.patch
Patch6: subversion-1.5.0-pie.patch
Patch7: subversion-1.1.3-java.patch
Patch8: subversion-1.5.0-perl510.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
@ -108,6 +109,7 @@ This package includes the Ruby bindings to the Subversion libraries.
%if %{with_java}
%patch7 -p1 -b .java
%endif
%patch8 -p1 -b .perl510
%build
# Regenerate after patches to build.conf et al
@ -273,6 +275,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Wed Jul 2 2008 Joe Orton <jorton@redhat.com> 1.5.0-4
- swig-perl test suite fix for Perl 5.10 (upstream r31546)
* Tue Jul 1 2008 Joe Orton <jorton@redhat.com> 1.5.0-3
- attempt build without java bits