[openstack-keystone] drop requirements.txt in spec, not in patch

[Alan Pevec]

commit f0c776feed9539a0b664332896dbc2491a1b26fe
Author: Alan Pevec <alan.pevec at redhat.com>
Date:   Thu Sep 11 13:42:20 2014 +0200

    drop requirements.txt in spec, not in patch

 0001-remove-runtime-dep-on-python-pbr.patch |   42 ++------------------------
 openstack-keystone.spec                     |    3 +-
 2 files changed, 6 insertions(+), 39 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index c96d6e5..f2f8609 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,13 +1,12 @@
-From 16959aa5e419fa0de0e8e0f170dd051808d89fb1 Mon Sep 17 00:00:00 2001
+From 3837f8ccf791cae1f6abc10d20e0aa4ce99038f0 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 00:38:42 +0200
 Subject: [PATCH] remove runtime dep on python-pbr
 
 ---
- bin/keystone-all |  3 +--
- keystone/cli.py  |  3 +--
- requirements.txt | 27 +--------------------------
- 3 files changed, 3 insertions(+), 30 deletions(-)
+ bin/keystone-all | 3 +--
+ keystone/cli.py  | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/bin/keystone-all b/bin/keystone-all
 index 732ee8e..e548763 100755
@@ -51,36 +50,3 @@ index e8c84af..140832d 100644
           usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
           default_config_files=config_files)
      config.setup_logging()
-diff --git a/requirements.txt b/requirements.txt
-index 4d3ea05..e975d85 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,27 +1,2 @@
- # keystone dependencies
--pbr>=0.6,!=0.7,<1.0
--WebOb>=1.2.3
--eventlet>=0.13.0
--greenlet>=0.3.2
--netaddr>=0.7.6
--PasteDeploy>=1.5.0
--Paste
--Routes>=1.12.3,!=2.0
--six>=1.7.0
--SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
--sqlalchemy-migrate>=0.9.1
--passlib
--iso8601>=0.1.9
--python-keystoneclient>=0.9.0
--keystonemiddleware>=1.0.0
--oslo.config>=1.4.0.0a3
--oslo.messaging>=1.4.0.0a3
--oslo.db>=0.2.0  # Apache-2.0
--oslo.i18n>=0.1.0  # Apache-2.0
--oslo.utils>=0.1.1
--Babel>=1.3
--oauthlib>=0.6
--dogpile.cache>=0.5.3
--jsonschema>=2.0.0,<3.0.0
--pycadf>=0.6.0
--posix_ipc
-+# let RPM handle deps
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index cb18dd3..4e7a935 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -122,7 +122,8 @@ find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
 # Remove bundled egg-info
 rm -rf keystone.egg-info
-
+# Let RPM handle the dependencies
+rm -f test-requirements.txt requirements.txt
 # Remove dependency on pbr and set version as per rpm
 sed -i s/REDHATKEYSTONEVERSION/%{version}/ bin/keystone-all keystone/cli.py