upgrading package: subversion 1.2.3 -> 1.3.0

subversion/subversion.patch

@@ -22,95 +22,40 @@ Index: apr-util/crypto/getuuid.c
  }
  
  static void get_system_time(apr_uint64_t *uuid_time)
-Index: build-outputs.mk
---- build-outputs.mk.orig	2005-05-20 19:42:00 +0200
-+++ build-outputs.mk	2005-05-26 21:22:50 +0200
-@@ -4,6 +4,34 @@
- # Section 1: Global make variables
- ########################################
- 
-+OPENPKG_LIBS_ROOT = \
-+    ../../../../subversion
-+OPENPKG_LIBS_SVN = \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_client/libsvn_client-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_delta/libsvn_delta-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_diff/libsvn_diff-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_fs/libsvn_fs-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_fs_base/libsvn_fs_base-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_fs_fs/libsvn_fs_fs-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_ra/libsvn_ra-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_ra_dav/libsvn_ra_dav-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_ra_local/libsvn_ra_local-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_ra_svn/libsvn_ra_svn-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_repos/libsvn_repos-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_subr/libsvn_subr-1.la \
-+    $(OPENPKG_LIBS_ROOT)/libsvn_wc/libsvn_wc-1.la
-+OPENPKG_LIBS_EXT = \
-+    -liconv -lz `neon-config --libs` -lssl -lcrypto -lxml2
-+OPENPKG_PYTHON_LIBS = \
-+    $(OPENPKG_LIBS_SVN) \
-+    $(OPENPKG_LIBS_SVN) \
-+    $(OPENPKG_LIBS_SVN) \
-+    $(OPENPKG_LIBS_SVN) \
-+    $(SVN_APRUTIL_LIBS) \
-+    $(SVN_APR_LIBS) \
-+    $(OPENPKG_LIBS_EXT) \
-+    $(LIBS)
-+
- FS_BASE_DEPS = subversion/libsvn_fs_base/libsvn_fs_base-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
- FS_BASE_LINK = ../../subversion/libsvn_fs_base/libsvn_fs_base-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la
- 
-@@ -325,43 +353,43 @@
- python_client_DEPS =  subversion/bindings/swig/python/svn_client.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/python/_core.la
- python_client_OBJECTS = svn_client.lo
- subversion/bindings/swig/python/_client.la: $(python_client_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(LT_NO_UNDEFINED) $(python_client_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(LT_NO_UNDEFINED) $(python_client_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS) $(OPENPKG_PYTHON_LIBS)
- 
- python_core_PATH = subversion/bindings/swig/python
- python_core_DEPS =  subversion/bindings/swig/python/core.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la
- python_core_OBJECTS = core.lo
- subversion/bindings/swig/python/_core.la: $(python_core_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(LT_NO_UNDEFINED) $(python_core_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(LT_NO_UNDEFINED) $(python_core_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS) $(OPENPKG_PYTHON_LIBS)
- 
- python_delta_PATH = subversion/bindings/swig/python
- python_delta_DEPS =  subversion/bindings/swig/python/svn_delta.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/python/_core.la
- python_delta_OBJECTS = svn_delta.lo
- subversion/bindings/swig/python/_delta.la: $(python_delta_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(LT_NO_UNDEFINED) $(python_delta_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(LT_NO_UNDEFINED) $(python_delta_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) $(OPENPKG_PYTHON_LIBS)
- 
- python_fs_PATH = subversion/bindings/swig/python
- python_fs_DEPS =  subversion/bindings/swig/python/svn_fs.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/python/_core.la
- python_fs_OBJECTS = svn_fs.lo
- subversion/bindings/swig/python/_fs.la: $(python_fs_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(LT_NO_UNDEFINED) $(python_fs_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(LT_NO_UNDEFINED) $(python_fs_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) $(OPENPKG_PYTHON_LIBS)
- 
- python_ra_PATH = subversion/bindings/swig/python
- python_ra_DEPS =  subversion/bindings/swig/python/svn_ra.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/python/_core.la
- python_ra_OBJECTS = svn_ra.lo
- subversion/bindings/swig/python/_ra.la: $(python_ra_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(LT_NO_UNDEFINED) $(python_ra_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(LT_NO_UNDEFINED) $(python_ra_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) $(OPENPKG_PYTHON_LIBS)
+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@"
  
- python_repos_PATH = subversion/bindings/swig/python
- python_repos_DEPS =  subversion/bindings/swig/python/svn_repos.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/python/_core.la
- python_repos_OBJECTS = svn_repos.lo
- subversion/bindings/swig/python/_repos.la: $(python_repos_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(LT_NO_UNDEFINED) $(python_repos_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(LT_NO_UNDEFINED) $(python_repos_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) $(OPENPKG_PYTHON_LIBS)
+-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@"
  
- python_wc_PATH = subversion/bindings/swig/python
- python_wc_DEPS =  subversion/bindings/swig/python/svn_wc.lo subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/python/_core.la
- python_wc_OBJECTS = svn_wc.lo
- subversion/bindings/swig/python/_wc.la: $(python_wc_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(LT_NO_UNDEFINED) $(python_wc_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(LT_NO_UNDEFINED) $(python_wc_OBJECTS) $(LSWIGPY) ../../../../subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) $(OPENPKG_PYTHON_LIBS)
+ 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 @@
+       ac_sub_cache_file="$ac_dots$cache_file" ;;
+     esac
  
- ra_local_test_PATH = subversion/tests/libsvn_ra_local
- ra_local_test_DEPS =  subversion/tests/libsvn_ra_local/ra-local-test.o subversion/tests/libsvn_test-1.la subversion/tests/libsvn_test_fs-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
++    args="$args --prefix=$prefix/libexec/subversion/neon"
++    if [ ".$with_ssl" = .yes ]; then
++        args="$args --with-ssl"
++    fi
++
+     # The eval makes quoting arguments work.
+     if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args
+     then :
 Index: subversion/bindings/swig/perl/native/Makefile.PL.in
 --- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2005-03-22 10:31:58 +0100
 +++ subversion/bindings/swig/perl/native/Makefile.PL.in	2005-05-26 21:18:45 +0200
@@ -145,37 +90,3 @@ Index: subversion/bindings/swig/perl/native/Makefile.PL.in
                    `$swig -perl -ldflags`)],
      test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
  );
-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 @@
-       ac_sub_cache_file="$ac_dots$cache_file" ;;
-     esac
- 
-+    args="$args --prefix=$prefix/libexec/subversion/neon"
-+    if [ ".$with_ssl" = .yes ]; then
-+        args="$args --with-ssl"
-+    fi
-+
-     # The eval makes quoting arguments work.
-     if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args
-     then :

subversion/subversion.spec

@@ -23,10 +23,12 @@
 ##
 
 #   package version
-%define       V_dist    1.2.3
-%define       V_opkg    1.2.3
-%define       V_cvs2svn 1.3.0
-%define       V_svn2cvs 20051121
+%define       V_dist      1.3.0
+%define       V_opkg      1.3.0
+%define       V_cvs2svn   1.3.0
+%define       V_svn2cvs   20051121
+%define       V_book_html 20051222
+%define       V_book_pdf  20050525
 
 #   package information
 Name:         subversion
@@ -39,7 +41,7 @@ Class:        BASE
 Group:        SCM
 License:      Apache/BSD
 Version:      %{V_opkg}
-Release:      20051121
+Release:      20060102
 
 #   package options
 %option       with_cvs2svn  no
@@ -51,9 +53,11 @@ Release:      20051121
 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:      subversion.config
-Source4:      subversion.servers
-Source5:      rc.subversion
+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
 Patch0:       subversion.patch
 
 #   build information
@@ -137,12 +141,6 @@ AutoReqProv:  no
 
 %build
     #   configure package
-%if "%{with_perl}" == "yes"
-    bindings="${bindings}${bindings+,}perl"
-%endif
-%if "%{with_python}" == "yes"
-    bindings="${bindings}${bindings+,}python"
-%endif
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags libxml2 .}" \
@@ -155,7 +153,12 @@ AutoReqProv:  no
         --enable-static \
 %if "%{with_perl}" == "yes" || "%{with_python}" == "yes"
         --with-swig=%{l_prefix}/bin/swig \
-        --enable-swig-bindings="$bindings" \
+%endif
+%if "%{with_perl}" == "yes"
+        --with-perl=%{l_prefix}/bin/perl \
+%endif
+%if "%{with_python}" == "yes"
+        --with-python=%{l_prefix}/bin/python \
 %endif
         --disable-nls \
         --disable-shared \
@@ -168,15 +171,11 @@ AutoReqProv:  no
 %if "%{with_perl}" == "yes"
     ( cd apr;      ln -s .libs/libapr-0.a .     ) || exit $?
     ( cd apr-util; ln -s .libs/libaprutil-0.a . ) || exit $?
-    %{l_shtool} mkdir -f -p -m 755 \
-        subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
     %{l_make} %{l_mflags} swig-pl
 %endif
 
     #   build Python bindings
 %if "%{with_python}" == "yes"
-    mv libtool libtool.orig
-    ln -s %{l_prefix}/bin/libtool .
     %{l_make} %{l_mflags} swig-py
 %endif
 
@@ -197,6 +196,7 @@ AutoReqProv:  no
     %{l_make} %{l_mflags} install-swig-py DESTDIR=$RPM_BUILD_ROOT
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsvn_swig_py*
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python/libsvn/_*.a
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python/libsvn/_*.la
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python \
        $RPM_BUILD_ROOT%{l_prefix}/lib/python
 %endif
@@ -258,9 +258,11 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/share/subversion
     %{l_shtool} install -c -m 644 \
-        doc/book/svn-book.html \
-        doc/book/svn-book.pdf \
-        $RPM_BUILD_ROOT%{l_prefix}/share/subversion/
+        %{SOURCE svn-book-%{V_book_pdf}.pdf} \
+        $RPM_BUILD_ROOT%{l_prefix}/share/subversion/svn-book.pdf
+    %{l_shtool} install -c -m 644 \
+        %{SOURCE svn-book-%{V_book_html}.html} \
+        $RPM_BUILD_ROOT%{l_prefix}/share/subversion/svn-book.html
 
 %if "%{with_cvs2svn}" == "yes"
     #   install cvs2svn(1) tool