upgrade to Subversion 1.4

subversion/rc.subversion

@@ -32,13 +32,11 @@
     rcService subversion active yes && exit 0
     if rcVarIsYes subversion_daemon; then
         if [ ".$subversion_daemon_root" != . ]; then
-            ( nohup @l_prefix@/bin/svnserve --daemon --foreground \
+            @l_prefix@/bin/svnserve --daemon \
                   --listen-host $subversion_daemon_host \
                   --listen-port $subversion_daemon_port \
                   --root $subversion_daemon_root \
-                  </dev/null >/dev/null 2>&1 &
-              echo $! >$subversion_daemon_pidfile
-            ) >/dev/null 2>&1
+                  --pid-file $subversion_daemon_pidfile
         fi
     fi
 

subversion/subversion.patch

@@ -75,26 +75,6 @@ Index: apr-util/crypto/getuuid.c
 +    /* UUID field: node */
      memcpy(&d[10], uuid_state_node, NODE_LENGTH);
  }
-Index: svn-config.in
---- svn-config.in.orig	2003-12-16 17:41:14 +0100
-+++ svn-config.in	2005-05-26 21:18:45 +0200
-@@ -22,10 +22,14 @@
- libdir="@libdir@"
- includedir="@includedir@"
- 
--LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@"
-+SVN_LIBS=""
-+for name in client repos delta diff wc ra ra_local ra_dav ra_svn fs fs_base fs_fs subr; do
-+    SVN_LIBS="$SVN_LIBS -lsvn_${name}-1"
-+done
-+LIBS="$SVN_LIBS @NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @LIBS@"
- CFLAGS="@CFLAGS@"
- CPPFLAGS="@CPPFLAGS@"
--INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
-+INCLUDES="@SVN_NEON_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
- LDFLAGS="@LDFLAGS@"
- 
- SVN_SOURCE_DIR="@abs_srcdir@"
 --- configure.orig      Fri Jul  1 22:18:48 2005
 +++ configure   Fri Aug  5 17:18:33 2005
 @@ -19775,6 +19775,11 @@

subversion/subversion.spec

@@ -23,12 +23,12 @@
 ##
 
 #   package version
-%define       V_dist      1.3.2
-%define       V_opkg      1.3.2
-%define       V_cvs2svn   1.3.1
+%define       V_dist      1.4.0
+%define       V_opkg      1.4.0
+%define       V_cvs2svn   1.4.0
 %define       V_svn2cvs   20060127
-%define       V_book_html 20060127
-%define       V_book_pdf  20060127
+%define       V_book_html 20060912
+%define       V_book_pdf  20060912
 
 #   package information
 Name:         subversion
@@ -41,7 +41,7 @@ Class:        BASE
 Group:        SCM
 License:      Apache/BSD
 Version:      %{V_opkg}
-Release:      20060825
+Release:      20060912
 
 #   package options
 %option       with_cvs2svn  no
@@ -51,14 +51,15 @@ Release:      20060825
 %option       with_ruby     no
 
 #   list of sources
-Source0:      http://subversion.tigris.org/tarballs/subversion-%{V_dist}.tar.gz
-Source1:      ftp://ftp.openpkg.org/sources/CPY/subversion/cvs2svn-%{V_cvs2svn}.tar.gz
-Source2:      ftp://ftp.openpkg.org/sources/CPY/subversion/svn2cvs.pl-%{V_svn2cvs}
-Source3:      ftp://ftp.openpkg.org/sources/CPY/subversion/svn-book-%{V_book_html}.html
-Source4:      ftp://ftp.openpkg.org/sources/CPY/subversion/svn-book-%{V_book_pdf}.pdf
-Source5:      subversion.config
-Source6:      subversion.servers
-Source7:      rc.subversion
+Source0:      http://subversion.tigris.org/downloads/subversion-%{V_dist}.tar.gz
+Source1:      http://subversion.tigris.org/downloads/subversion-deps-%{V_dist}.tar.gz
+Source2:      ftp://ftp.openpkg.org/sources/CPY/subversion/cvs2svn-%{V_cvs2svn}.tar.gz
+Source3:      ftp://ftp.openpkg.org/sources/CPY/subversion/svn2cvs.pl-%{V_svn2cvs}
+Source4:      ftp://ftp.openpkg.org/sources/CPY/subversion/svn-book-%{V_book_html}.html
+Source5:      ftp://ftp.openpkg.org/sources/CPY/subversion/svn-book-%{V_book_pdf}.pdf
+Source6:      subversion.config
+Source7:      subversion.servers
+Source8:      rc.subversion
 Patch0:       subversion.patch
 
 #   build information
@@ -119,7 +120,8 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %setup -q -T -D -a 1
+    %setup -q -T -D -b 1
+    %setup -q -T -D -a 2
     cp %{SOURCE svn2cvs.pl-%{V_svn2cvs}} svn2cvs.pl
     %patch -p0
 
@@ -129,7 +131,7 @@ AutoReqProv:  no
 
     #   patch: correctly pass --disable-shared to sub-directories
     %{l_shtool} subst \
-        -e 's;\($ac_abs_srcdir/configure\) $ac_configure_args;\1 --disable-shared;' \
+        -e 's;\($ac_abs_srcdir/configure $ac_configure_args\);\1 --disable-shared;' \
         configure
 
     #   patch: adjust path to configuration directory
@@ -153,6 +155,7 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --with-berkeley-db=%{l_prefix} \
+        --with-dbm=db44 \
         --with-ssl \
         --with-zlib \
         --enable-static \
@@ -248,10 +251,6 @@ AutoReqProv:  no
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon*
     strip  $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
 
-    #   install svn-config(1) tool
-    %{l_shtool} install -c -m 755 \
-        svn-config $RPM_BUILD_ROOT%{l_prefix}/bin/
-
     #   install svn_load_dirs(1) tool
     %{l_shtool} install -c -m 755 \
         -e 's;#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
@@ -287,7 +286,8 @@ AutoReqProv:  no
     #   install cvs2svn(1) tool
     ( cd cvs2svn-%{V_cvs2svn}
       %{l_shtool} mkdir -f -p -m 755 \
-          $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_rcsparse
+          $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_rcsparse \
+          $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_lib
       ( echo "#!/bin/sh"
         echo "PYTHONPATH=\"%{l_prefix}/libexec/subversion/cvs2svn\""
         echo "export PYTHONPATH"
@@ -302,6 +302,9 @@ AutoReqProv:  no
       %{l_shtool} install -c -m 644 \
           cvs2svn_rcsparse/*.py \
           $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_rcsparse/
+      %{l_shtool} install -c -m 644 \
+          cvs2svn_lib/*.py \
+          $RPM_BUILD_ROOT%{l_prefix}/libexec/subversion/cvs2svn/cvs2svn_lib/
     ) || exit $?
 %endif