Merge branch 'master' into f17

This commit is contained in:
Joe Orton 2012-10-11 16:15:51 +01:00
commit 672b7b18c6
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ subversion-1.6.12.tar.bz2
/subversion-1.7.4.tar.bz2
/subversion-1.7.5.tar.bz2
/subversion-1.7.6.tar.bz2
/subversion-1.7.7.tar.bz2

View File

@ -1 +1 @@
4baa434db7709bb059b05d02a2547663 subversion-1.7.6.tar.bz2
5a42b7d0f1366a8d60f9ad7d5890295d subversion-1.7.7.tar.bz2

View File

@ -25,12 +25,12 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.7.6
Version: 1.7.7
Release: 1%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
Source1: subversion.conf
Source3: filter-requires.sh
Source4: http://www.xsteve.at/prg/emacs/psvn.el
@ -479,6 +479,9 @@ fi
%endif
%changelog
* Thu Oct 11 2012 Joe Orton <jorton@redhat.com> - 1.7.7-1
- update to 1.7.7
* Fri Aug 17 2012 Joe Orton <jorton@redhat.com> - 1.7.6-1
- update to 1.7.6