diff --git a/.gitignore b/.gitignore index 41d4ee1..2a7c897 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ pyasn1-0.0.9a.tar.gz /v0.1.2.tar.gz /v0.1.5.tar.gz /v0.3.7.tar.gz +/v0.4.4.tar.gz +/v0.2.2.tar.gz diff --git a/python-pyasn1.spec b/python-pyasn1.spec index 9972cd1..3afe2c5 100644 --- a/python-pyasn1.spec +++ b/python-pyasn1.spec @@ -1,9 +1,9 @@ %global module pyasn1 -%global modules_version 0.1.5 +%global modules_version 0.2.2 Name: python-pyasn1 -Version: 0.3.7 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} Summary: ASN.1 tools for Python License: BSD Group: System Environment/Libraries @@ -16,28 +16,6 @@ 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} -BuildRequires: python3-devel -BuildRequires: python3-setuptools - -%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} @@ -67,44 +45,29 @@ BuildRequires: python3-sphinx %build -%py2_build %py3_build pushd ../pyasn1-modules-%{modules_version} -%py2_build %py3_build popd -pushd doc +pushd docs PYTHONPATH=%{buildroot}%{python3_sitelib} make SPHINXBUILD=sphinx-build-3 html popd %install -%py2_install %py3_install pushd ../pyasn1-modules-%{modules_version} -%py2_install %py3_install popd %check -PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} setup.py test 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 @@ -117,9 +80,14 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} setup.py test %files doc %license LICENSE.rst -%doc doc/build/html/* +%doc docs/build/html/* %changelog +* Mon Oct 15 2018 Rob Crittenden - 0.4.4-1 +- Update to 0.4.4 (#1582010) +- Update modules to 0.2.2 +- Drop python 2 subpackages + * Sat Jul 14 2018 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 51fe860..85c13c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v0.1.5.tar.gz) = 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a -SHA512 (v0.3.7.tar.gz) = 0f35ca77361ee4913a280a32dfb6720244b2ae3e927620045a5f4879f2d50595e8dd5ec886b707ac76763887c178b0ab95b8a4b5184de83d7e98fe56b7b35c34 +SHA512 (v0.4.4.tar.gz) = dfe410ba8c801026ab78005efe20b496c268c5d3e0cdda855a54d548a6dd170fc50489db23315fd7d268cea36077e8c9e7461620d3abe365b5ef503d277b0b5b +SHA512 (v0.2.2.tar.gz) = c94a84fab2f9ba3ab8e23c6d37bf92500cd499f68a7c643fd0731ea5886206acd06079ad4827b649e0d43c26ec426d7c1950ad145bcb53f485debc3f292fd304