[python-swiftclient/el6: 3/3] Merge branch 'master' into el6

[Jakub Ruzicka]

commit 153cd34e299b5aa3caf78b6404131e1e4b240a51
Merge: d1d3bf8 74b6ff3
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Mon Sep 2 23:12:36 2013 +0200

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |   46 +++++++++++++++++++-
 python-swiftclient.spec                            |   16 +++++--
 sources                                            |    2 +-
 4 files changed, 57 insertions(+), 8 deletions(-)
---
diff --cc python-swiftclient.spec
index 933b936,5e84927..a5bba81
--- a/python-swiftclient.spec
+++ b/python-swiftclient.spec
@@@ -72,6 -73,14 +73,11 @@@ rm -fr doc/build/html/.doctrees doc/bui
  %doc LICENSE doc/build/html
  
  %changelog
+ * Mon Sep 02 2013 Jakub Ruzicka <jruzicka at redhat.com> - 1.6.0-1
+ - Update to upstream 1.6.0.
+ - Include man page.
+ - Remove all pbr deps in the patch instead of this spec file.
+ 
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Mon Jul 22 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.5.0-1
  - Update to upstream 1.5.0 release.
  - Add new build requires: python-pbr, python-d2to1.