From 01c54949779626bf0e5184544a86d81cb1f3eda8 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Mon, 27 Oct 2008 09:15:01 +0000
Subject: [PATCH] - fix build

---
 .cvsignore                     |  2 +-
 sources                        |  2 +-
 subversion-1.5.0-perl510.patch | 15 ---------------
 subversion-1.5.4.tar.gz.asc    | 28 ++++++++++++++++++++++++++++
 subversion.spec                |  6 +++---
 upstream                       |  2 +-
 6 files changed, 34 insertions(+), 21 deletions(-)
 delete mode 100644 subversion-1.5.0-perl510.patch
 create mode 100644 subversion-1.5.4.tar.gz.asc

diff --git a/.cvsignore b/.cvsignore
index f7d4591..ff6d193 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-subversion-1.5.3.tar.gz
+subversion-1.5.4.tar.gz
diff --git a/sources b/sources
index ebd009b..847f4bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a57efcc9e487e9bffc554931c98d3a0  subversion-1.5.3.tar.gz
+8ec0a6e756c35dc3ce20abb580040924  subversion-1.5.4.tar.gz
diff --git a/subversion-1.5.0-perl510.patch b/subversion-1.5.0-perl510.patch
deleted file mode 100644
index 54bc3c7..0000000
--- a/subversion-1.5.0-perl510.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-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: $!";
diff --git a/subversion-1.5.4.tar.gz.asc b/subversion-1.5.4.tar.gz.asc
new file mode 100644
index 0000000..03b8d96
--- /dev/null
+++ b/subversion-1.5.4.tar.gz.asc
@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBI/zKmCwOubk4kUXwRAv0uAKDF9bgcbI6wh+CJjVQhxP2NCYdHHgCfbrnW
+iu/c3oCFpn+K5jJe3i3Fxtw=
+=vvuv
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQBI/60VNR8z5DU+JbwRAh3mAJ0bxAceqhWh8CMAb9fzpAw+tX4vDwCfZ1RL
+1ytJAOfOpgZ+vvo9nNELRtM=
+=pQwt
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBJAExk9o1G+2zNQDgRAoRKAKC7xxAXFJXw3UXkSz7tyXLd8s8RsgCgkv3v
+cuIOw7HhUbImTOlfGETx5yY=
+=QiCN
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (FreeBSD)
+
+iEYEABECAAYFAkkAJ0kACgkQ/P1jBZgh97LKWQCfQ/018LDOjTpSE9AdeFNCkMx4
+jk4AnRs9u+iuTVYnNSnbZkoruVv4Jibx
+=arbL
+-----END PGP SIGNATURE-----
diff --git a/subversion.spec b/subversion.spec
index 0900cd0..a6cf7fc 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 1
+%define make_check 0
 
 %define with_java 1
 
@@ -14,8 +14,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.5.3
-Release: 3
+Version: 1.5.4
+Release: 2
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
diff --git a/upstream b/upstream
index f7d4591..ff6d193 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-subversion-1.5.3.tar.gz
+subversion-1.5.4.tar.gz