upgrading package: subversion 1.1.4 -> 1.2.0

subversion/subversion.patch

@@ -1,8 +1,8 @@
 Index: Makefile.in
---- Makefile.in.orig	2005-03-26 21:03:11 +0100
-+++ Makefile.in	2005-04-07 19:54:13 +0200
-@@ -581,7 +581,7 @@
-         done
+--- Makefile.in.orig	2005-05-09 07:56:09 +0200
++++ Makefile.in	2005-05-26 21:18:45 +0200
+@@ -575,7 +575,7 @@
+ install-swig-rb: install-swig-rb-lib
  
  $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
 -	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
@@ -11,8 +11,8 @@ Index: Makefile.in
  swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
  swig-pl: $(swig-pl_DEPS)
 Index: apr-util/crypto/getuuid.c
---- apr-util/crypto/getuuid.c.orig	2005-04-01 22:44:09 +0200
-+++ apr-util/crypto/getuuid.c	2005-04-07 19:54:13 +0200
+--- apr-util/crypto/getuuid.c.orig	2005-05-20 19:41:51 +0200
++++ apr-util/crypto/getuuid.c	2005-05-26 21:18:45 +0200
 @@ -102,7 +102,7 @@
  static void get_pseudo_node_identifier(unsigned char *node)
  {
@@ -23,10 +23,11 @@ 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-04-01 22:44:13 +0200
-+++ build-outputs.mk	2005-04-07 19:56:01 +0200
-@@ -1,5 +1,33 @@
- # DO NOT EDIT -- AUTOMATICALLY GENERATED
+--- 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
@@ -59,60 +60,60 @@ Index: build-outputs.mk
  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
  
-@@ -269,42 +297,42 @@
- 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
+@@ -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_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
+ 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_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
+ 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_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
+ 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)
  
- 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
+ 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)
  
- python_runtime_DEPS = mkdir-init subversion/bindings/swig/python/swigpy.lo
- python_runtime_OBJECTS = swigpy.lo
- subversion/bindings/swig/python/swigpy.la: $(python_runtime_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o swigpy.la $(LT_NO_UNDEFINED) $(python_runtime_OBJECTS)  $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o swigpy.la $(LT_NO_UNDEFINED) $(python_runtime_OBJECTS)  $(LIBS) $(OPENPKG_PYTHON_LIBS)
- 
- 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
+ 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)
  
- ra_local_test_DEPS =  subversion/tests/libsvn_ra_local/ra-local-test.o subversion/tests/libsvn_test-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
- ra_local_test_OBJECTS = ra-local-test.o
+ 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
 Index: subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2005-03-20 23:12:33 +0100
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in	2005-04-07 19:54:13 +0200
+--- 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
 @@ -26,16 +26,12 @@
                                                                        ra_dav
                                                                        fs_base
@@ -146,7 +147,7 @@ Index: subversion/bindings/swig/perl/native/Makefile.PL.in
  );
 Index: svn-config.in
 --- svn-config.in.orig	2003-12-16 17:41:14 +0100
-+++ svn-config.in	2005-04-07 19:54:13 +0200
++++ svn-config.in	2005-05-26 21:18:45 +0200
 @@ -22,10 +22,14 @@
  libdir="@libdir@"
  includedir="@includedir@"

subversion/subversion.spec

@@ -23,9 +23,9 @@
 ##
 
 #   package version
-%define       V_dist   1.1.4
-%define       V_opkg   1.1.4
-%define       V_tools  20050305
+%define       V_dist   1.2.0
+%define       V_opkg   1.2.0
+%define       V_tools  20050525
 
 #   package information
 Name:         subversion
@@ -38,7 +38,7 @@ Class:        BASE
 Group:        SCM
 License:      Apache/BSD
 Version:      %{V_opkg}
-Release:      20050407
+Release:      20050526
 
 #   package options
 %option       with_cvs2svn  no
@@ -248,8 +248,8 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/share/subversion
     %{l_shtool} install -c -m 644 \
-        doc/book/book/svn-book.html \
-        doc/book/book/svn-book.pdf \
+        doc/book/svn-book.html \
+        doc/book/svn-book.pdf \
         $RPM_BUILD_ROOT%{l_prefix}/share/subversion/
 
 %if "%{with_cvs2svn}" == "yes"