diff --git a/python-pyasn1.spec b/python-pyasn1.spec index 949a4a3..3c89b6d 100644 --- a/python-pyasn1.spec +++ b/python-pyasn1.spec @@ -1,10 +1,9 @@ Name: python-pyasn1 Version: 0.4.8 -Release: 1 +Release: 2 Summary: ASN.1 library for Python License: BSD Source0: https://github.com/etingof/pyasn1/archive/v%{version}.tar.gz -Source1: https://github.com/etingof/pyasn1-modules/archive/v0.1.5.tar.gz URL: http://pyasn1.sourceforge.net/ BuildArch: noarch BuildRequires: python2-devel python2-setuptools python3-devel python3-setuptools @@ -18,23 +17,16 @@ The pyasn1 library implements ASN.1 support in pure-Python. %package -n python2-pyasn1 Summary: Pyasn1 in python 2 -Provides: python2-pyasn1-modules -Obsoletes: python2-pyasn1-modules %{?python_provide:%python_provide python2-pyasn1} %{!?python_provide:Provides: python-pyasn1} -%{?python_provide:%python_provide python2-pyasn1-modules} -%{!?python_provide:Provides: python-pyasn1-modules} %description -n python2-pyasn1 Pyasn1 in python 2. %package -n python3-pyasn1 Summary: Pyasn1 in python 3 -Provides: python3-pyasn1-modules -Obsoletes: python3-pyasn1-modules %{?python_provide:%python_provide python3-pyasn1} -%{?python_provide:%python_provide python3-modules} %description -n python3-pyasn1 Pyasn1 in python 3. @@ -49,37 +41,23 @@ Obsoletes: python-pyasn1-doc Documentation for python-pyasn1. %prep -%autosetup -n pyasn1-%{version} -p1 -b1 +%autosetup -n pyasn1-%{version} rm -rf %{py3dir} cp -a . %{py3dir} -cp -a ../pyasn1-modules-0.1.5 %{py3dir}-modules %build %{__python} setup.py build -cd ../pyasn1-modules-0.1.5 -%{__python} setup.py build -cd - cd %{py3dir} %{__python3} setup.py build cd - -cd %{py3dir}-modules -%{__python3} setup.py build -cd - %install cd %{py3dir} %{__python3} setup.py install --skip-build --root %{buildroot} cd - -cd %{py3dir}-modules -%{__python3} setup.py install --skip-build --root %{buildroot} -cd - - %{__python} setup.py install --skip-build --root %{buildroot} -cd ../pyasn1-modules-0.1.5 -%{__python} setup.py install --skip-build --root %{buildroot} -cd - cd docs PYTHONPATH="$RPM_BUILD_ROOT%{python_sitelib}:$PYTHONPATH" make html @@ -98,8 +76,6 @@ cd - %license LICENSE.rst %{python_sitelib}/pyasn1 %{python_sitelib}/pyasn1-%{version}-*.egg-info/ -%{python_sitelib}/pyasn1_modules/ -%{python_sitelib}/pyasn1_modules-0.1.5-*.egg-info/ %files -n python3-pyasn1 %defattr(-,root,root,-) @@ -107,14 +83,15 @@ cd - %license LICENSE.rst %{python3_sitelib}/pyasn1 %{python3_sitelib}/pyasn1-%{version}-*.egg-info/ -%{python3_sitelib}/pyasn1_modules/ -%{python3_sitelib}/pyasn1_modules-0.1.5-*.egg-info/ %files help %license LICENSE.rst %doc docs/build/html/* %changelog +* Thu Oct 15 2020 Zhipeng Xie - 0.4.8-2 +- delete duplicate pyasn1-modules + * Thu Oct 15 2020 Zhipeng Xie - 0.4.8-1 - upgrade to v0.4.8 diff --git a/v0.1.5.tar.gz b/v0.1.5.tar.gz deleted file mode 100644 index e991c09..0000000 Binary files a/v0.1.5.tar.gz and /dev/null differ