subversion 1.4.5 -> 1.5.5

5 files changed, 16 insertions, 18 deletions

diff --git a/meta/packages/subversion/files/libtool2.patch b/meta/packages/subversion/files/libtool2.patch
deleted file mode 100644
index a0163fd7f5..0000000000
--- a/meta/packages/subversion/files/libtool2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: subversion-1.4.5/configure.in
-===================================================================
---- subversion-1.4.5.orig/configure.in  2009-01-07 17:10:41.000000000 +0000
-+++ subversion-1.4.5/configure.in       2009-01-07 17:13:32.000000000 +0000
-@@ -138,10 +138,10 @@
-   echo "using APR's libtool"
-   sh_libtool="`$apr_config --apr-libtool`"
-   LIBTOOL="$sh_libtool"
-   SVN_LIBTOOL="$sh_libtool"
- else
--  sh_libtool="$abs_builddir/libtool"
--  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
-+  sh_libtool="$abs_builddir/$host_alias-libtool"
-+  SVN_LIBTOOL="\$(abs_builddir)/$host_alias-libtool"
-   dnl libtoolize requires that the following line not be indented
- AC_PROG_LIBTOOL
- fi
diff --git a/meta/packages/subversion/files/disable-revision-install.patch b/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch
index a1c60654cb..a1c60654cb 100644
--- a/meta/packages/subversion/files/disable-revision-install.patch
+++ b/meta/packages/subversion/subversion-1.5.5/disable-revision-install.patch
diff --git a/meta/packages/subversion/subversion-1.5.5/libtool2.patch b/meta/packages/subversion/subversion-1.5.5/libtool2.patch
new file mode 100644
index 0000000000..08343b09ec
--- /dev/null
+++ b/meta/packages/subversion/subversion-1.5.5/libtool2.patch
@@ -0,0 +1,15 @@
+Index: subversion-1.5.5/configure.ac
+===================================================================
+--- subversion-1.5.5.orig/configure.ac  2008-08-26 18:27:56.000000000 +0100
++++ subversion-1.5.5/configure.ac       2009-01-07 18:00:47.000000000 +0000
+@@ -153,8 +153,8 @@
+   LIBTOOL="$sh_libtool"
+   SVN_LIBTOOL="$sh_libtool"
+ else
+-  sh_libtool="$abs_builddir/libtool"
+-  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
++  sh_libtool="$abs_builddir/$host_alias-libtool"
++  SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
+   dnl libtoolize requires that the following line not be indented
+ ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
+ fi
diff --git a/meta/packages/subversion/files/neon-detection.patch b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch
index b567d5c050..b567d5c050 100644
--- a/meta/packages/subversion/files/neon-detection.patch
+++ b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch
diff --git a/meta/packages/subversion/subversion_1.4.5.bb b/meta/packages/subversion/subversion_1.5.5.bb
index 40ba53e813..4a1153ce0b 100644
--- a/meta/packages/subversion/subversion_1.4.5.bb
+++ b/meta/packages/subversion/subversion_1.5.5.bb
@@ -5,7 +5,7 @@ RDEPENDS = "neon"
 LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 
-PR = "r1"
+PR = "r4"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \