diff --git a/pedantic-compile.diff b/pedantic-compile.diff deleted file mode 100644 index a3214da..0000000 --- a/pedantic-compile.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- subversion/include/svn_wc.h -+++ subversion/include/svn_wc.h -@@ -795,7 +795,7 @@ typedef enum svn_wc_notify_action_t - svn_wc_notify_foreign_merge_begin, - - /** Replace notification. @since New in 1.5. */ -- svn_wc_notify_update_replace, -+ svn_wc_notify_update_replace - - } svn_wc_notify_action_t; - diff --git a/subversion-1.5.x.tar.bz2 b/subversion-1.5.x.tar.bz2 index d1e2021..2f6b122 100644 --- a/subversion-1.5.x.tar.bz2 +++ b/subversion-1.5.x.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c880f19bfcfae0c636a66191661251bf21aad26860b9acb665b1aff21892fb5 -size 8601019 +oid sha256:01c500cbfd899a7203a6dffddfa7da88c08595e049bb74025a6d1695dfe5e94c +size 8583620 diff --git a/subversion.changes b/subversion.changes index a300df4..bd5a0cc 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 4 11:55:50 CEST 2008 - olh@suse.de + +- update to rev 31014, 1.5.0-rc5 + various bugfixes + ------------------------------------------------------------------- Thu Apr 24 11:27:47 CEST 2008 - dmueller@suse.de diff --git a/subversion.spec b/subversion.spec index d0b5383..41ea9b7 100644 --- a/subversion.spec +++ b/subversion.spec @@ -20,7 +20,7 @@ BuildRequires: neon-devel openldap2-devel %endif BuildRequires: sqlite-devel Version: 1.5.0 -Release: 74 +Release: 79 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -56,7 +56,6 @@ Patch33: subversion.header_wrappers.patch Patch34: subversion.allowed-neon.patch Patch35: subversion.java14.patch Patch36: subversion-1.5.x-no-neon-la.patch -Patch37: pedantic-compile.diff # %description @@ -163,7 +162,6 @@ esac %patch34 -p1 %patch35 -p1 %patch36 -p1 -%patch37 %build with_jdk=none @@ -421,6 +419,9 @@ rm -rf $RPM_BUILD_ROOT %{apache_libexecdir}/mod_authz_svn.* %changelog +* Sun May 04 2008 olh@suse.de +- update to rev 31014, 1.5.0-rc5 + various bugfixes * Thu Apr 24 2008 dmueller@suse.de - fix headers to compile with -pedantic again * Tue Apr 22 2008 olh@suse.de