diff --git a/castellan-0.19.0.tar.gz b/castellan-0.19.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..685eb043c504947f3864996e78ef1ddf8b3a531f
Binary files /dev/null and b/castellan-0.19.0.tar.gz differ
diff --git a/castellan-3.6.0.tar.gz b/castellan-3.6.0.tar.gz
deleted file mode 100644
index 05f315d608781197cf59d4362c994790fc86e622..0000000000000000000000000000000000000000
Binary files a/castellan-3.6.0.tar.gz and /dev/null differ
diff --git a/python-castellan.spec b/python-castellan.spec
index cd6104ab8aba86202c0ba5ca679c9cc5545e56cc..f375d3f97e71d585806db0ce294b9a4215d2c3cb 100644
--- a/python-castellan.spec
+++ b/python-castellan.spec
@@ -1,24 +1,69 @@
-%global _empty_manifest_terminate_build 0
-
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
+%global with_python3 0
 
 Name:           python-castellan
-Version:        3.6.0
-Release:        2%{?dist}
+Version:        0.19.0
+Release:        1
 Summary:        Generic Key Manager interface for OpenStack
 
 Group:          Development/Languages
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            http://git.openstack.org/cgit/openstack/castellan
 Source0:        https://tarballs.openstack.org/castellan/castellan-%{upstream_version}.tar.gz
 BuildArch:      noarch
 
+
+%description
+Generic Key Manager interface for OpenStack
+
+%package -n python2-castellan
+Summary:    OpenStack common configuration library
+
+
 BuildRequires:  openstack-macros
 BuildRequires:  git
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-pbr
+BuildRequires:  python2-mock
+BuildRequires:  python2-six
+BuildRequires:  python2-testtools
+BuildRequires:  python2-oslo-config
+BuildRequires:  python2-oslo-log
+BuildRequires:  python2-oslo-utils
+BuildRequires:  python2-oslotest
+BuildRequires:  python2-barbicanclient
+BuildRequires:  python2-cryptography
+BuildRequires:  python2-keystoneauth1
+BuildRequires:  python2-testrepository
+
+Requires:       python2-babel >= 2.3.4
+Requires:       python2-barbicanclient >= 4.5.2
+Requires:       python2-cryptography
+Requires:       python2-keystoneauth1 >= 3.4.0
+Requires:       python2-six
+Requires:       python2-oslo-config >= 2:5.2.0
+Requires:       python2-oslo-context >= 2.19.2
+Requires:       python2-oslo-i18n >= 3.15.3
+Requires:       python2-oslo-log >= 3.36.0
+Requires:       python2-oslo-utils >= 3.33.0
+Requires:       python2-stevedore >= 1.20.0
+Requires:       python2-pbr
+
+%description -n python2-castellan
+Generic Key Manager interface for OpenStack
+
+%if 0%{?with_python3}
+%package -n python3-castellan
+Summary:        Generic Key Manager interface for OpenStack
+Group:          Development/Libraries
+
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pbr
 BuildRequires:  python3-mock
+BuildRequires:  python3-six
+BuildRequires:  python3-testrepository
 BuildRequires:  python3-testtools
 BuildRequires:  python3-oslo-config
 BuildRequires:  python3-oslo-log
@@ -27,49 +72,72 @@ BuildRequires:  python3-oslotest
 BuildRequires:  python3-barbicanclient
 BuildRequires:  python3-cryptography
 BuildRequires:  python3-keystoneauth1
-BuildRequires:  python3-requests
-BuildRequires:  python3-testrepository
-
-%description
-Generic Key Manager interface for OpenStack
-
-%package -n python3-castellan
-Summary:    OpenStack common configuration library
-%{?python_provide:%python_provide python3-castellan}
 
+Requires:       python3-six
+Requires:       python3-pbr
+Requires:       python3-babel >= 2.3.4
 Requires:       python3-barbicanclient >= 4.5.2
 Requires:       python3-cryptography
 Requires:       python3-keystoneauth1 >= 3.4.0
-Requires:       python3-oslo-config 
+Requires:       python3-oslo-config >= 2:5.2.0
 Requires:       python3-oslo-context >= 2.19.2
 Requires:       python3-oslo-i18n >= 3.15.3
 Requires:       python3-oslo-log >= 3.36.0
 Requires:       python3-oslo-utils >= 3.33.0
 Requires:       python3-stevedore >= 1.20.0
-Requires:       python3-pbr
-Requires:       python3-requests >= 2.18.0
+
 
 %description -n python3-castellan
 Generic Key Manager interface for OpenStack
+%endif
 
 %prep
 %autosetup -n castellan-%{upstream_version} -S git
 %py_req_cleanup
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
+
 %build
-python3 setup.py build
+%{__python} setup.py build
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
 
 %install
-python3 setup.py install --skip-build --root %{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
+popd
+%endif
+
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 %check
-PYTHON=python3 OS_TEST_PATH=./castellan/tests/unit python3 setup.py test
+%if 0%{?with_python3}
+OS_TEST_PATH=./castellan/tests/unit %{__python3} setup.py test
+%endif
+OS_TEST_PATH=./castellan/tests/unit %{__python2} setup.py test
 
+%files -n python2-castellan
+%doc README.rst LICENSE
+%{python_sitelib}/castellan
+%{python_sitelib}/castellan-*.egg-info
+
+%if 0%{?with_python3}
 %files -n python3-castellan
 %doc README.rst LICENSE
 %{python3_sitelib}/castellan
 %{python3_sitelib}/castellan-*.egg-info
+%endif
 
 %changelog
-* Mon Nov 23 2020 Python_Bot <Python_Bot@openeuler.org>
+* Fri May 07 2021 Python_Bot <Python_Bot@openeuler.org>
 - Package Spec generated
+
+