From dc74899afb51074820ff64e7a475135cd45e99ad Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan1007@gmail.com>
Date: Sat, 20 Feb 2021 11:39:08 +0800
Subject: [PATCH] Fix requires issue

---
 openstack-keystone.defaultconf |  2 --
 openstack-keystone.spec        | 11 +++++------
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 openstack-keystone.defaultconf

diff --git a/openstack-keystone.defaultconf b/openstack-keystone.defaultconf
deleted file mode 100644
index ebd997d..0000000
--- a/openstack-keystone.defaultconf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-log_dir=/var/log/keystone
\ No newline at end of file
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 940f6da..050bab4 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,13 +1,12 @@
 Name:           openstack-keystone
 Version:        18.0.0
-Release:        1
+Release:        2
 Summary:        OpenStack Identity Service
 License:        ASL 2.0
 URL:            https://launchpad.net/keystone
 Source0:        keystone-18.0.0.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.sysctl
-Source3:        openstack-keystone.defaultconf
 
 BuildRequires:  openstack-macros
 BuildRequires:  python3-flask
@@ -88,7 +87,7 @@ Requires:       python3-memcached
 Requires:       python3-pytz
 Requires:       python3-scrypt
 Requires:       python3-six
-Requires:       python3-migrate
+Requires:       python3-sqlalchemy-migrate
 Requires:       python3-stevedore
 
 %description -n   python3-keystone
@@ -122,7 +121,6 @@ install -d -m 750 %{buildroot}%{_localstatedir}/{lib,log,cache}/keystone
 install -d -m 755 %{buildroot}%{_sysconfdir}/keystone/keystone.conf.d/
 # default dir for fernet tokens
 install -d -m 750 %{buildroot}%{_sysconfdir}/keystone/credential-keys/
-install -D -m 644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/keystone.conf
 install -p -D -m 640 etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf
 install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf
 install -p -D -m 640 etc/keystone.policy.yaml %{buildroot}%{_sysconfdir}/keystone/keystone.policy.yaml
@@ -142,7 +140,6 @@ install -p -D -m 644 httpd/wsgi-keystone.conf  %{buildroot}%{_datadir}/keystone/
 exit 0
 
 %post
-%tmpfiles_create %{_tmpfilesdir}/keystone.conf
 %sysctl_apply openstack-keystone.conf
 
 %files
@@ -152,7 +149,6 @@ exit 0
 %{_bindir}/keystone-wsgi-public
 %{_bindir}/keystone-manage
 %{_bindir}/keystone-status
-%_tmpfilesdir/keystone.conf
 %dir %{_datadir}/keystone
 %attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
 %attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf
@@ -177,5 +173,8 @@ exit 0
 %exclude %{python3_sitelib}/keystone/tests
 
 %changelog
+* Sat Feb 20 2021 wangxiyuan <wangxiyuan1007@gmail.org>
+- Fix Requires Issue and drop useless file
+
 * Wed Feb 3 2021 wangxiyuan <wangxiyuan1007@gmail.org>
 - Support OpenStack Victoria release