diff --git a/.gitignore b/.gitignore index 113a149..f3f49cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/pyasn1-modules-0.0.4.tar.gz -SOURCES/pyasn1-0.1.6.tar.gz +SOURCES/pyasn1-0.1.9.tar.gz +SOURCES/pyasn1-modules-0.0.8.tar.gz diff --git a/.python-pyasn1.metadata b/.python-pyasn1.metadata index c91d127..f18abf7 100644 --- a/.python-pyasn1.metadata +++ b/.python-pyasn1.metadata @@ -1,2 +1,2 @@ -d2a96b7b212f5b18a88197641546383c9ca088ac SOURCES/pyasn1-modules-0.0.4.tar.gz -a704cef65e3b8e5b67aa9d7969c93c063cdd20b3 SOURCES/pyasn1-0.1.6.tar.gz +d19599c5d9d039ead21ffcd1a2392c29a838ae03 SOURCES/pyasn1-0.1.9.tar.gz +0ee39382b5b97c8694a3373706edc1baea2e0e71 SOURCES/pyasn1-modules-0.0.8.tar.gz diff --git a/SPECS/python-pyasn1.spec b/SPECS/python-pyasn1.spec index 73cc2e8..11d7e73 100644 --- a/SPECS/python-pyasn1.spec +++ b/SPECS/python-pyasn1.spec @@ -5,11 +5,11 @@ %endif %global module pyasn1 -%global modules_version 0.0.4 +%global modules_version 0.0.8 Name: python-pyasn1 -Version: 0.1.6 -Release: 2%{?dist} +Version: 0.1.9 +Release: 7%{?dist} Summary: ASN.1 tools for Python License: BSD Group: System Environment/Libraries @@ -29,15 +29,29 @@ BuildRequires: python3-setuptools This is an implementation of ASN.1 types and codecs in the Python programming language. -%package modules +%package -n python2-pyasn1 +Summary: ASN.1 tools for Python 2 +%{?python_provide:%python_provide python2-pyasn1} +%{!?python_provide:Provides: python-pyasn1 = %{version}-%{release}} +Obsoletes: python-pyasn1 < 0.1.9-3 + +%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: python-pyasn1 >= %{version}-%{release} +%{?python_provide:%python_provide python2-pyasn1-modules} +%{!?python_provide:Provides: python-pyasn1-modules = %{version}-%{release}} +Obsoletes: python-pyasn1-modules < 0.1.9-3 -%description 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} %description -n python3-pyasn1 This is an implementation of ASN.1 types and codecs in the Python 3 programming @@ -46,6 +60,7 @@ language. %package -n python3-pyasn1-modules Summary: Modules for pyasn1 Requires: python3-pyasn1 >= %{version}-%{release} +%{?python_provide:%python_provide python3-modules} %description -n python3-pyasn1-modules ASN.1 types modules for python3-pyasn1. @@ -110,13 +125,14 @@ popd rm -rf $RPM_BUILD_ROOT -%files +%files -n python2-pyasn1 %defattr(-,root,root,-) -%doc README LICENSE doc/*.html +%doc README.txt doc/*.html +%license LICENSE.txt %{python_sitelib}/%{module} %{python_sitelib}/%{module}-%{version}-*.egg-info/ -%files modules +%files -n python2-pyasn1-modules %defattr(-,root,root,-) %{python_sitelib}/%{module}_modules/ %{python_sitelib}/%{module}_modules-%{modules_version}-*.egg-info/ @@ -124,7 +140,8 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} %files -n python3-pyasn1 %defattr(-,root,root,-) -%doc README LICENSE doc/*.html +%doc README.txt doc/*.html +%license LICENSE.txt %{python3_sitelib}/%{module} %{python3_sitelib}/%{module}-%{version}-*.egg-info/ @@ -135,6 +152,15 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 23 2016 Jan Cholasta - 0.1.9-7 +- Add missing Obsoletes on old package names + +* Tue May 3 2016 Jan Cholasta - 0.1.9-6 +- Set version and release in python- Provides + +* Tue Apr 26 2016 Jan Cholasta - 0.1.9-5.1 +- Update to upstream 0.1.9, modules 0.0.8 + * Fri Dec 27 2013 Daniel Mach - 0.1.6-2 - Mass rebuild 2013-12-27