From 30346bd592cfe3a89cd8ef9ac3f93fe753ab8bd3 Mon Sep 17 00:00:00 2001 From: zhangy1317 Date: Fri, 7 May 2021 15:25:20 +0800 Subject: [PATCH 1/3] add spec and tar for python2 version --- python-cursive.spec | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/python-cursive.spec b/python-cursive.spec index 5350776..dd1ae01 100644 --- a/python-cursive.spec +++ b/python-cursive.spec @@ -1,44 +1,48 @@ %global _empty_manifest_terminate_build 0 Name: python-cursive Version: 0.2.2 -Release: 2 +Release: 1 Summary: Cursive implements OpenStack-specific validation of digital signatures. -License: Apache Software License +License: Apache-2.0 URL: http://www.openstack.org/ Source0: https://files.pythonhosted.org/packages/aa/ec/d0e802482530a0b664c910c845cada1e490bc2af568acc0c1ed55c000502/cursive-0.2.2.tar.gz BuildArch: noarch - -Requires: python3-pbr -Requires: python3-cryptography -Requires: python3-castellan - %description +Cursive implements OpenStack-specific validation of digital signatures. -%package -n python3-cursive +%package -n python2-cursive Summary: Cursive implements OpenStack-specific validation of digital signatures. Provides: python-cursive -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-pip -%description -n python3-cursive +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pip +Requires: python2-pbr +Requires: python2-cryptography +Requires: python2-oslo-serialization +Requires: python2-oslo-utils +Requires: python2-oslo-i18n +Requires: python2-oslo-log +Requires: python2-castellan +%description -n python2-cursive +Cursive implements OpenStack-specific validation of digital signatures. %package help Summary: Development documents and examples for cursive -Provides: python3-cursive-doc +Provides: python2-cursive-doc %description help +Cursive implements OpenStack-specific validation of digital signatures. %prep %autosetup -n cursive-0.2.2 %build -%py3_build +%py2_build %install -%py3_install +%py2_install install -d -m755 %{buildroot}/%{_pkgdocdir} if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi @@ -65,14 +69,12 @@ popd mv %{buildroot}/filelist.lst . mv %{buildroot}/doclist.lst . -%files -n python3-cursive -f filelist.lst -%dir %{python3_sitelib}/* +%files -n python2-cursive -f filelist.lst +%dir %{python2_sitelib}/* %files help -f doclist.lst %{_docdir}/* %changelog -* Mon Jan 25 2021 zhangy1317 -- Add BuildRequires python3-pip and python3-pbr -* Mon Nov 23 2020 Python_Bot +* Thu Apr 29 2021 openstack-sig - Package Spec generated -- Gitee From 01849664606273a3656fdd0e6c03437a8c43e19f Mon Sep 17 00:00:00 2001 From: zhangy1317 Date: Tue, 11 May 2021 09:56:43 +0800 Subject: [PATCH 2/3] fix provides --- python-cursive.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-cursive.spec b/python-cursive.spec index dd1ae01..bd44677 100644 --- a/python-cursive.spec +++ b/python-cursive.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-cursive Version: 0.2.2 -Release: 1 +Release: 2 Summary: Cursive implements OpenStack-specific validation of digital signatures. License: Apache-2.0 URL: http://www.openstack.org/ @@ -13,7 +13,7 @@ Cursive implements OpenStack-specific validation of digital signatures. %package -n python2-cursive Summary: Cursive implements OpenStack-specific validation of digital signatures. -Provides: python-cursive +Provides: python2-cursive BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-pip @@ -76,5 +76,7 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Mon May 10 2021 openstack-sig +- Fix provides * Thu Apr 29 2021 openstack-sig - Package Spec generated -- Gitee From b974f510c21136e9ae7394d5b9d41e2dbef162a6 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Tue, 1 Jun 2021 17:06:23 +0800 Subject: [PATCH 3/3] Adds BuildRequires python2-pbr to make obs success --- python-cursive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-cursive.spec b/python-cursive.spec index bd44677..cc85bdb 100644 --- a/python-cursive.spec +++ b/python-cursive.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-cursive Version: 0.2.2 -Release: 2 +Release: 3 Summary: Cursive implements OpenStack-specific validation of digital signatures. License: Apache-2.0 URL: http://www.openstack.org/ @@ -14,6 +14,7 @@ Cursive implements OpenStack-specific validation of digital signatures. %package -n python2-cursive Summary: Cursive implements OpenStack-specific validation of digital signatures. Provides: python2-cursive +BuildRequires: python2-pbr BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-pip @@ -76,6 +77,8 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Tue Jun 1 2021 huangtianhua +- Adds BuildRequires python2-pbr to make obs success * Mon May 10 2021 openstack-sig - Fix provides * Thu Apr 29 2021 openstack-sig -- Gitee