rpms/subversion/devel subversion-1.5.0-perl510.patch, NONE, 1.1 subversion.spec, 1.113, 1.114

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.5.0-perl510.patch 
Log Message:
* Wed Jul  2 2008 Joe Orton <jorton at redhat.com> 1.5.0-4
- swig-perl test suite fix for Perl 5.10 (upstream r31546)


subversion-1.5.0-perl510.patch:

--- NEW FILE subversion-1.5.0-perl510.patch ---

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: $!";


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- subversion.spec	1 Jul 2008 19:31:09 -0000	1.113
+++ subversion.spec	2 Jul 2008 07:17:34 -0000	1.114
@@ -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 @@
 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 @@
 %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 @@
 %endif
 
 %changelog
+* Wed Jul  2 2008 Joe Orton <jorton at redhat.com> 1.5.0-4
+- swig-perl test suite fix for Perl 5.10 (upstream r31546)
+
 * Tue Jul  1 2008 Joe Orton <jorton at redhat.com> 1.5.0-3
 - attempt build without java bits