OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=14

subversion-1.5.x.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b89e5ac43f07d1c2c6d9058a32e14fb4f3efd3a75e7dc6d8979ea301fcc7d71e
+oid sha256:471320988fcb959f65899dfa79f7e059a2701120129134ffd1fcb19afe161e67
-size 8462943
+size 8614029

subversion.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 29 11:06:19 CET 2007 - olh@suse.de
+
+- update to rev 27452
+  reenable javahl
+
 -------------------------------------------------------------------
 Thu Oct 25 09:57:02 CEST 2007 - dmueller@suse.de
 

subversion.fallback-to-ipv4.patch

@@ -5,11 +5,9 @@ but doesnt respond to ipv6 right now.
  subversion/libsvn_ra_svn/client.c |   20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
-Index: subversion-1.4.x/subversion/libsvn_ra_svn/client.c
+--- a/subversion/libsvn_ra_svn/client.c
-===================================================================
++++ b/subversion/libsvn_ra_svn/client.c
---- subversion-1.4.x.orig/subversion/libsvn_ra_svn/client.c
+@@ -145,10 +145,30 @@ static svn_error_t *make_connection(cons
-+++ subversion-1.4.x/subversion/libsvn_ra_svn/client.c
-@@ -139,10 +139,30 @@ static svn_error_t *make_connection(cons
      return svn_error_wrap_apr(status, _("Can't create socket"));
  
    status = apr_socket_connect(*sock, sa);

subversion.header_wrappers.patch

@@ -8,11 +8,9 @@
  build/generator/swig/header_wrappers.py |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: subversion-1.4.x/build/generator/swig/header_wrappers.py
+--- a/build/generator/swig/header_wrappers.py
-===================================================================
++++ b/build/generator/swig/header_wrappers.py
---- subversion-1.4.x.orig/build/generator/swig/header_wrappers.py
+@@ -239,7 +239,7 @@ class Generator(generator.swig.Generator
-+++ subversion-1.4.x/build/generator/swig/header_wrappers.py
-@@ -146,7 +146,7 @@ class Generator(generator.swig.Generator
        self.proxy_filename(base_fname))
  
      # Open the output file
@@ -21,7 +19,7 @@ Index: subversion-1.4.x/build/generator/swig/header_wrappers.py
      self.ofile.write('/* Proxy classes for %s\n' % base_fname)
      self.ofile.write(' * DO NOT EDIT -- AUTOMATICALLY GENERATED */\n')
  
-@@ -165,6 +165,7 @@ class Generator(generator.swig.Generator
+@@ -264,6 +264,7 @@ class Generator(generator.swig.Generator
  
      # Close our output file
      self.ofile.close()

subversion.pedantic-headers.diff

@@ -1,5 +1,10 @@
---- subversion/include/svn_types.h
+---
-+++ subversion/include/svn_types.h
+ subversion/include/svn_types.h |    4 ++--
+ subversion/include/svn_wc.h    |    6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/subversion/include/svn_types.h
++++ b/subversion/include/svn_types.h
 @@ -257,7 +257,7 @@ typedef enum
       in any files or subdirectories not already present; those
       subdirectories' this_dir entries will have depth-infinity.
@@ -9,7 +14,7 @@
  
  } svn_depth_t;
  
-@@ -835,7 +835,7 @@ typedef enum
+@@ -841,7 +841,7 @@ typedef enum
    svn_rangelist_equal_inheritance,
  
    /* Inheritability of both ranges must be @c TRUE. */
@@ -18,18 +23,18 @@
  } svn_merge_range_inheritance_t;
  
  /**
---- subversion/include/svn_wc.h
+--- a/subversion/include/svn_wc.h
-+++ subversion/include/svn_wc.h
++++ b/subversion/include/svn_wc.h
-@@ -769,7 +769,7 @@ typedef enum svn_wc_notify_action_t
+@@ -772,7 +772,7 @@ typedef enum svn_wc_notify_action_t
+   svn_wc_notify_merge_begin,
  
-   /** A merge operation (to path) has begun.  See @c merge_range in
+   /** Replace notification. */
-       @c svn_wc_notify_t.  @since New in 1.5   */
+-  svn_wc_notify_update_replace,
--  svn_wc_notify_merge_begin,
++  svn_wc_notify_update_replace
-+  svn_wc_notify_merge_begin
  
  } svn_wc_notify_action_t;
  
-@@ -1044,7 +1044,7 @@ typedef enum svn_wc_conflict_reason_t
+@@ -1047,7 +1047,7 @@ typedef enum svn_wc_conflict_reason_t
  typedef enum svn_wc_conflict_kind_t
  {
    svn_wc_conflict_kind_text,         /* textual conflict (on a file) */
@@ -38,7 +43,7 @@
  
    /* ### Add future kinds here that represent "tree" conflicts. */
  
-@@ -1129,7 +1129,7 @@ typedef enum svn_wc_conflict_choice_t
+@@ -1132,7 +1132,7 @@ typedef enum svn_wc_conflict_choice_t
    svn_wc_conflict_choose_base,   /* user chooses the original version */
    svn_wc_conflict_choose_theirs, /* user chooses incoming version */
    svn_wc_conflict_choose_mine,   /* user chooses his/her own version */

subversion.perl.LD_RUN_PATH.patch

@@ -3,11 +3,9 @@ clear LD_RUN_PATH, it will end up as RPATH in ELF binaries
  Makefile.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: subversion-1.4.x/Makefile.in
+--- a/Makefile.in
-===================================================================
++++ b/Makefile.in
---- subversion-1.4.x.orig/Makefile.in
+@@ -643,7 +643,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
-+++ subversion-1.4.x/Makefile.in
-@@ -605,7 +605,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
  	./config.status subversion/bindings/swig/perl/native/Makefile.PL
  
  $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL $(swig-pl_native_Makefile_DEPS)

subversion.props.state_pos.patch

@@ -24,7 +24,7 @@ subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
 
 --- a/subversion/libsvn_wc/props.c
 +++ b/subversion/libsvn_wc/props.c
-@@ -1142,7 +1142,7 @@ set_prop_merge_state(svn_wc_notify_state
+@@ -1160,7 +1160,7 @@ set_prop_merge_state(svn_wc_notify_state
        svn_wc_notify_state_merged,
        svn_wc_notify_state_obstructed,
        svn_wc_notify_state_conflicted };

subversion.spec

@@ -11,10 +11,15 @@
 # norootforbuild
 
 Name:           subversion
-BuildRequires:  apache2-devel db-devel gcc-c++ java2-devel-packages libneon-devel openldap2-devel python-devel swig
+BuildRequires:  apache2-devel db-devel gcc-c++ java2-devel-packages openldap2-devel python-devel swig
+%if 0%{?suse_version} > 1030
+BuildRequires:  libneon-devel
+%else
+BuildRequires:  neon-devel
+%endif
 BuildRequires:  sqlite-devel
 Version:        1.5.0
-Release:        6
+Release:        9
 #
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 #
@@ -131,16 +136,14 @@ esac
 %patch12 -p1
 #
 %patch20 -p1
-%if 0%{?suse_version} > 930
 %patch23 -p1
-%endif
 %patch24 -p1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
-%patch36
+%patch36 -p1
 
 %build
 with_jdk=none
@@ -165,7 +168,6 @@ with_jdk="$i"
 break
 fi
 done
-with_jdk=none
 if [ "$with_jdk" != "none" ] ; then
 with_jdk="--with-jdk=$with_jdk --enable-javahl"
 echo with_jdk > with_jdk
@@ -236,7 +238,7 @@ make %{?jobs:-j%jobs}
 if [ "$with_jdk" != "" ] ; then
 with_jdk=javahl
 fi
-make swig-py swig-pl $with_jdk %{?jobs:-j%jobs}
+make swig-py swig-pl $with_jdk
 #
 
 %install
@@ -391,6 +393,9 @@ rm -rf $RPM_BUILD_ROOT
 %{apache_libexecdir}/mod_dav_svn.*
 %{apache_libexecdir}/mod_authz_svn.*
 %changelog
+* Mon Oct 29 2007 - olh@suse.de
+- update to rev 27452
+  reenable javahl
 * Thu Oct 25 2007 - dmueller@suse.de
 - fix subversion headers to be compileable with -pedantic
 * Mon Oct 15 2007 - olh@suse.de

subversion.svn_swig_perl.dep.patch

@@ -16,11 +16,9 @@
  Makefile.in |    9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-Index: subversion-1.4.x/Makefile.in
+--- a/Makefile.in
-===================================================================
++++ b/Makefile.in
---- subversion-1.4.x.orig/Makefile.in
+@@ -636,15 +636,16 @@ clean-swig-headers:
-+++ subversion-1.4.x/Makefile.in
-@@ -598,15 +598,16 @@ clean-swig-headers:
  extraclean-swig-headers: clean-swig-headers
  	$(EXTRACLEAN_SWIG_HEADERS)