This commit is contained in:
committed by
Git OBS Bridge
parent
a5ebdbf02e
commit
9642e24b8d
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8e4829612c9f6d439eeb89f96f1f76048bc418051de5762cb0d6f16cd8df607f
|
||||
size 8362951
|
||||
oid sha256:4e8f8ecb143504f44092ab986917ae7670bbae2a89e84a74ff1fb29cb28eefc2
|
||||
size 8436909
|
||||
|
@@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 10 10:00:30 CET 2007 - olh@suse.de
|
||||
|
||||
- update to rev 27753
|
||||
various bugfixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 5 11:40:17 CET 2007 - olh@suse.de
|
||||
|
||||
|
@@ -1,54 +0,0 @@
|
||||
---
|
||||
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.
|
||||
Equivalent to the pre-1.5 default update behavior. */
|
||||
- svn_depth_infinity = 3,
|
||||
+ svn_depth_infinity = 3
|
||||
|
||||
} svn_depth_t;
|
||||
|
||||
@@ -841,7 +841,7 @@ typedef enum
|
||||
svn_rangelist_equal_inheritance,
|
||||
|
||||
/* Inheritability of both ranges must be @c TRUE. */
|
||||
- svn_rangelist_only_inheritable,
|
||||
+ svn_rangelist_only_inheritable
|
||||
} svn_merge_range_inheritance_t;
|
||||
|
||||
/**
|
||||
--- a/subversion/include/svn_wc.h
|
||||
+++ b/subversion/include/svn_wc.h
|
||||
@@ -772,7 +772,7 @@ typedef enum svn_wc_notify_action_t
|
||||
svn_wc_notify_merge_begin,
|
||||
|
||||
/** Replace notification. */
|
||||
- svn_wc_notify_update_replace,
|
||||
+ svn_wc_notify_update_replace
|
||||
|
||||
} svn_wc_notify_action_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) */
|
||||
- svn_wc_conflict_kind_property, /* property conflict (on a file or dir) */
|
||||
+ svn_wc_conflict_kind_property /* property conflict (on a file or dir) */
|
||||
|
||||
/* ### Add future kinds here that represent "tree" conflicts. */
|
||||
|
||||
@@ -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 */
|
||||
- svn_wc_conflict_choose_merged, /* user chooses the merged version */
|
||||
+ svn_wc_conflict_choose_merged /* user chooses the merged version */
|
||||
|
||||
} svn_wc_conflict_choice_t;
|
||||
|
@@ -19,7 +19,7 @@ BuildRequires: neon-devel
|
||||
%endif
|
||||
BuildRequires: sqlite-devel
|
||||
Version: 1.5.0
|
||||
Release: 12
|
||||
Release: 13
|
||||
#
|
||||
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
|
||||
#
|
||||
@@ -58,7 +58,6 @@ Patch32: subversion.fallback-to-ipv4.patch
|
||||
Patch33: subversion.header_wrappers.patch
|
||||
Patch34: subversion.allowed-neon.patch
|
||||
Patch35: subversion.java14.patch
|
||||
Patch36: subversion.pedantic-headers.diff
|
||||
#
|
||||
|
||||
%description
|
||||
@@ -146,7 +145,6 @@ esac
|
||||
%patch33 -p1
|
||||
%patch34 -p1
|
||||
%patch35 -p1
|
||||
%patch36 -p1
|
||||
|
||||
%build
|
||||
with_jdk=none
|
||||
@@ -396,6 +394,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{apache_libexecdir}/mod_dav_svn.*
|
||||
%{apache_libexecdir}/mod_authz_svn.*
|
||||
%changelog
|
||||
* Sat Nov 10 2007 - olh@suse.de
|
||||
- update to rev 27753
|
||||
various bugfixes
|
||||
* Mon Nov 05 2007 - olh@suse.de
|
||||
- update to rev 27593
|
||||
allow upcoming neon versions
|
||||
|
Reference in New Issue
Block a user