[subversion: 2/2] merge

[jorton]

commit 3be5242bc48ed773b119dec1919dc29126b7b483
Merge: fdfc8e1 642a42e
Author: Joe Orton <jorton at redhat.com>
Date:   Mon Jul 16 09:28:15 2012 +0100

    merge

 subversion-1.7.5-kwallet-gcc47.patch |   44 ++++++++++++++++++++++++++++++++++
 subversion.spec                      |   15 ++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)
---
diff --cc subversion.spec
index dfa28fb,416cad8..6afac70
--- a/subversion.spec
+++ b/subversion.spec
@@@ -26,7 -26,7 +26,7 @@@
  Summary: A Modern Concurrent Version Control System
  Name: subversion
  Version: 1.7.5
- Release: 2%{?dist}
 -Release: 4%{?dist}
++Release: 5%{?dist}
  License: ASL 2.0
  Group: Development/Tools
  URL: http://subversion.apache.org/
@@@ -477,9 -479,15 +479,18 @@@ f
  %endif
  
  %changelog
- * Mon Jul 16 2012 Joe Orton <jorton at redhat.com> - 1.7.5-2
++* Mon Jul 16 2012 Joe Orton <jorton at redhat.com> - 1.7.5-5
 +- switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195)
 +
+ * Thu Jun 28 2012 Petr Pisar <ppisar at redhat.com> - 1.7.5-4
+ - Perl 5.16 rebuild
+ 
+ * Mon Jun 18 2012 Dan Horák <dan[at]danny.cz - 1.7.5-3
+ - fix build with recent gcc 4.7 (svn rev 1345740)
+ 
+ * Fri Jun 08 2012 Petr Pisar <ppisar at redhat.com> - 1.7.5-2
+ - Perl 5.16 rebuild
+ 
  * Tue May 22 2012 Joe Orton <jorton at redhat.com> - 1.7.5-1
  - update to 1.7.5