diff --git a/pycadf-2.8.0.tar.gz b/pycadf-2.8.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..736d564aed56399177e5945b6a1de1e118f48ff8
Binary files /dev/null and b/pycadf-2.8.0.tar.gz differ
diff --git a/pycadf-3.1.1.tar.gz b/pycadf-3.1.1.tar.gz
deleted file mode 100644
index cc294e78b3debd9437ca3826c6ae0fdd029c071a..0000000000000000000000000000000000000000
Binary files a/pycadf-3.1.1.tar.gz and /dev/null differ
diff --git a/python-pycadf.spec b/python-pycadf.spec
index 1669b29ee98fbe58f80bae26cc8578757d8356d5..e6b460d83329a8c140dd34a2c38c9410d8df42e2 100644
--- a/python-pycadf.spec
+++ b/python-pycadf.spec
@@ -1,76 +1,115 @@
+# Created by pyp2rpm-1.0.1
+%global sname pycadf
 
-Name:           python-pycadf
-Version:        3.1.1
+%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
+
+%global with_python3 0
+
+%global common_desc DMTF Cloud Audit (CADF) data model
+
+
+Name:           python-%{sname}
+Version:        2.8.0
 Release:        1
-Summary:        CADF Python module
-License:        Apache Software License
-URL:            https://docs.openstack.org/pycadf/latest/
-Source0:        https://files.pythonhosted.org/packages/83/5a/45506b000bf13fee4da64304aec169f9cddd0704add9a0339fd61f76a25c/pycadf-3.1.1.tar.gz
+Summary:        DMTF Cloud Audit (CADF) data model
+
+License:        Apache-2.0
+URL:            https://launchpad.net/pycadf
+Source0:        https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz
 BuildArch:      noarch
 
+
 %description
-This library provides an auditing data model based on \
-the Cloud Auditing Data Federation specification, primarily \
-for use by OpenStack. The goal is to establish strict expectations \
-about what auditors can expect from audit notifications.
+%{common_desc}
+
+
+%package -n python2-%{sname}
+Summary:        DMTF Cloud Audit (CADF) data model
+
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-pbr
 
+Requires:       python2-debtcollector >= 1.2.0
+Requires:       python2-oslo-config >= 2:5.2.0
+Requires:       python2-oslo-serialization >= 2.18.0
+Requires:       python2-pytz
+Requires:       python2-six >= 1.10.0
+Requires:       python-%{sname}-common = %{version}-%{release}
+
+%{?python_provide:%python_provide python2-%{sname}}
+
+%description -n python2-%{sname}
+%{common_desc}
+
+%if 0%{?with_python3}
+%package -n python3-%{sname}
+Summary:        DMTF Cloud Audit (CADF) data model
 
-%package -n python3-pycadf
-Summary:        CADF Python module
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pbr
 
 Requires:       python3-debtcollector >= 1.2.0
-Requires:       python3-oslo-config 
+Requires:       python3-oslo-config >= 2:5.2.0
 Requires:       python3-oslo-serialization >= 2.18.0
 Requires:       python3-pytz
 Requires:       python3-six >= 1.10.0
-Requires:       python-pycadf-common = %{version}-%{release}
+Requires:       python-%{sname}-common = %{version}-%{release}
 
-%description -n python3-pycadf
-This library provides an auditing data model based on \
-the Cloud Auditing Data Federation specification, primarily \
-for use by OpenStack. The goal is to establish strict expectations \
-about what auditors can expect from audit notifications.
+%{?python_provide:%python_provide python3-%{sname}}
 
-%package -n python-pycadf-common
-Summary:        CADF Python module
+%description -n python3-%{sname}
+%{common_desc}
+%endif
 
-%description -n python-pycadf-common
-This library provides an auditing data model based on \
-the Cloud Auditing Data Federation specification, primarily \
-for use by OpenStack. The goal is to establish strict expectations \
-about what auditors can expect from audit notifications.
+%package -n python-%{sname}-common
+Summary:        DMTF Cloud Audit (CADF) data model
+
+%description -n python-%{sname}-common
+%{common_desc}
 
 
 %prep
+%setup -q -n %{sname}-%{upstream_version}
+# Remove bundled egg-info
+rm -rf %{sname}.egg-info
 
-%setup -q -n pycadf-3.1.1
-rm -rf pycadf.egg-info
 
 %build
-%{py3_build}
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
+
 
 %install
-%{py3_install}
+%py2_install
+%if 0%{?with_python3}
+%py3_install
+%endif
 
 mkdir -p %{buildroot}/%{_sysconfdir}
-mv %{buildroot}/usr/etc/pycadf %{buildroot}/%{_sysconfdir}/
+mv %{buildroot}/usr/etc/%{sname} %{buildroot}/%{_sysconfdir}/
 
-%files -n python3-pycadf
-%{python3_sitelib}/pycadf
-%{python3_sitelib}/pycadf-3.1.1-py%{python3_version}.egg-info
 
-%files -n python-pycadf-common
+%files -n python2-%{sname}
+%{python2_sitelib}/%{sname}
+%{python2_sitelib}/%{sname}-%{upstream_version}-py?.?.egg-info
+
+%if 0%{?with_python3}
+%files -n python3-%{sname}
+%{python3_sitelib}/%{sname}
+%{python3_sitelib}/%{sname}-%{upstream_version}-py?.?.egg-info
+%endif
+
+%files -n python-%{sname}-common
 %doc README.rst
 %license LICENSE
-%dir %{_sysconfdir}/pycadf
-%config(noreplace) %{_sysconfdir}/pycadf/*.conf
+%dir %{_sysconfdir}/%{sname}
+%config(noreplace) %{_sysconfdir}/%{sname}/*.conf
 
 
 %changelog
-* Wed Dec 30 2020 Python_Bot <Python_Bot@openeuler.org>
-- Package Spec generated
-
-
+* Mon May 10 2021 Python_Bot <Python_Bot@openeuler.org>
+- Package Spec generated