[subversion: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/subversion

[jorton]

commit 83638c41287e194834b06db22c2d4bbc6d62ada0
Merge: e9cc4c8 e89dfaf
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Jul 20 09:28:10 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/subversion
    
    Conflicts:
    	subversion.spec

 subversion-MakeMaker.patch |   12 ++++++++++++
 subversion.spec            |   16 +++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
---
diff --cc subversion.spec
index a45b3e7,c2cc239..fc0fdc2
--- a/subversion.spec
+++ b/subversion.spec
@@@ -17,7 -17,7 +17,7 @@@
  Summary: A Modern Concurrent Version Control System
  Name: subversion
  Version: 1.6.17
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: ASL 1.1
  Group: Development/Tools
  URL: http://subversion.apache.org/
@@@ -69,14 -70,6 +70,14 @@@ Conflicts: apr%{?_isa}< 1.3.
  The subversion-libs package includes the essential shared libraries
  used by the Subversion version control tools.
  
 +%package python
 +Group: Development/Libraries
 +Summary: Python bindings for Subversion Version Control system
 +
 +%description python
- The subversion-python includes the Python bindings to the Subversion
- libraries.
++The subversion-python package includes the Python bindings to the
++Subversion libraries.
 +
  %package devel
  Group: Development/Tools
  Summary: Development package for the Subversion libraries
@@@ -439,8 -430,9 +441,12 @@@ f
  %{_mandir}/man1/svn2cl.1*
  
  %changelog
- * Fri Jun 24 2011 Joe Orton <jorton at redhat.com> - 1.6.17-2
- - split out python bindings
++* Wed Jul 20 2011 Joe Orton <jorton at redhat.com> - 1.6.17-3
++- split out python subpackage
++
+ * Wed Jun 15 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.6.17-2
+ - Perl mass rebuild
+ - change cflags in Makefile.PL to work with Perl 5.14.1
  
  * Thu Jun  2 2011 Joe Orton <jorton at redhat.com> - 1.6.17-1
  - update to 1.6.17 (#709952)