[openstack-keystone/el6: 2/2] Merge branch 'f17' into el6

[Alan Pevec]

commit db561c5bf51f2441c0399c6c226216a25e05ffbf
Merge: 032e51f 07386dc
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Aug 13 16:28:07 2012 +0200

    Merge branch 'f17' into el6

 .gitignore                             |    2 +-
 0001-fix-man-page-build.patch          |    2 +-
 0002-fix-sphinx-warnings.patch         |    2 +-
 0003-match-egg-and-spec-requires.patch |    2 +-
 openstack-keystone.spec                |   17 +++++++++--------
 sources                                |    2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)
---
diff --cc openstack-keystone.spec
index af180fa,deeab25..158f80f
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -16,17 -15,13 +15,16 @@@ Summary:        OpenStack Identity Serv
  License:        ASL 2.0
  URL:            http://keystone.openstack.org/
  Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
- #Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
- #Source0:        http://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.tar.gz
+ #Source0:        http://tarballs.openstack.org/keystone/keystone-%{version}%{snaptag}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
  
 +Patch0:       openstack-keystone-newdeps.patch
 +
  #
- # patches_base=2012.1.1
+ # patches_base=2012.1.2
  #
  Patch0001: 0001-fix-man-page-build.patch
  Patch0002: 0002-fix-sphinx-warnings.patch