From dd4ee29df9dba392c994cf8a3984995cd451537a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 16 Oct 2018 07:54:18 -0400 Subject: [PATCH] Restore python2 subpackages --- python-pyasn1.spec | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/python-pyasn1.spec b/python-pyasn1.spec index 5e17ee3..f73fd35 100644 --- a/python-pyasn1.spec +++ b/python-pyasn1.spec @@ -3,7 +3,7 @@ Name: python-pyasn1 Version: 0.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ASN.1 tools for Python License: BSD Group: System Environment/Libraries @@ -16,6 +16,26 @@ BuildArch: noarch This is an implementation of ASN.1 types and codecs in the Python programming language. +%package -n python2-pyasn1 +Summary: ASN.1 tools for Python 2 +%{?python_provide:%python_provide python2-pyasn1} +%{!?python_provide:Provides: python-pyasn1} +BuildRequires: python2-devel +BuildRequires: python2-setuptools + +%description -n python2-pyasn1 +This is an implementation of ASN.1 types and codecs in the Python 2 programming +language. + +%package -n python2-pyasn1-modules +Summary: Modules for pyasn1 +Requires: python2-pyasn1 >= %{version}-%{release} +%{?python_provide:%python_provide python2-pyasn1-modules} +%{!?python_provide:Provides: python-pyasn1-modules} + +%description -n python2-pyasn1-modules +ASN.1 types modules for python-pyasn1. + %package -n python3-pyasn1 Summary: ASN.1 tools for Python 3 %{?python_provide:%python_provide python3-pyasn1} @@ -47,9 +67,11 @@ BuildRequires: python3-sphinx %build +%py2_build %py3_build pushd ../pyasn1-modules-%{modules_version} +%py2_build %py3_build popd @@ -59,9 +81,11 @@ popd %install +%py2_install %py3_install pushd ../pyasn1-modules-%{modules_version} +%py2_install %py3_install popd @@ -70,6 +94,16 @@ popd PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test +%files -n python2-pyasn1 +%doc README.md +%license LICENSE.rst +%{python2_sitelib}/%{module} +%{python2_sitelib}/%{module}-%{version}-*.egg-info/ + +%files -n python2-pyasn1-modules +%{python2_sitelib}/%{module}_modules/ +%{python2_sitelib}/%{module}_modules-%{modules_version}-*.egg-info/ + %files -n python3-pyasn1 %doc README.md %license LICENSE.rst @@ -85,6 +119,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %doc docs/build/html/* %changelog +* Tue Oct 16 2018 Rob Crittenden - 0.4.4-3 +- Restore python2 subpackages + * Mon Oct 15 2018 Rob Crittenden - 0.4.4-2 - Add back accidentally removed buildrequires