diff --git a/python-jsonpointer.spec b/python-jsonpointer.spec index 2ccd269..df8f2e1 100644 --- a/python-jsonpointer.spec +++ b/python-jsonpointer.spec @@ -1,23 +1,9 @@ %global pypi_name jsonpointer %global github_name python-json-pointer -%if 0%{?fedora} || 0%{?rhel} > 7 -# Enable python3 build by default -%bcond_without python3 -%else -%bcond_with python3 -%endif - -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - Name: python-%{pypi_name} Version: 1.10 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Resolve JSON Pointers in Python License: BSD @@ -30,82 +16,34 @@ BuildArch: noarch %description Library to resolve JSON Pointers according to RFC 6901. -%if %{with python2} -%package -n python2-%{pypi_name} -Summary: Resolve JSON Pointers in Python -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -Library to resolve JSON Pointers according to RFC 6901. -%endif # with python2 - -%if %{with python3} %package -n python3-%{pypi_name} -Summary: Resolve JSON Pointers in Python - +Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-setuptools - %{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} Library to resolve JSON Pointers according to RFC 6901. -%endif # with python3 %prep %setup -q -n %{pypi_name}-%{version} %build -%if %{with python2} -%py2_build -%endif # with python2 -%if %{with python3} -LC_ALL=C.UTF-8 %py3_build -%endif # with python3 +%py3_build %install -%if %{with python2} -%py2_install -mv %{buildroot}%{_bindir}/jsonpointer %{buildroot}%{_bindir}/jsonpointer-%{python2_version} -ln -s ./jsonpointer-%{python2_version} %{buildroot}%{_bindir}/jsonpointer-2 -%if %{without python3} -ln -s ./jsonpointer-%{python2_version} %{buildroot}%{_bindir}/jsonpointer -%endif # without python3 -%endif # with python2 -%if %{with python3} -LC_ALL=C.UTF-8 %py3_install +%py3_install mv %{buildroot}%{_bindir}/jsonpointer %{buildroot}%{_bindir}/jsonpointer-%{python3_version} ln -s ./jsonpointer-%{python3_version} %{buildroot}%{_bindir}/jsonpointer-3 ln -s ./jsonpointer-%{python3_version} %{buildroot}%{_bindir}/jsonpointer -%endif # with python3 %check -%if %{with python3} %{__python3} tests.py -%endif # with python3 -%if %{with python2} -%{__python2} tests.py -%endif # with python2 -%if %{with python2} -%files -n python2-%{pypi_name} -%doc README.md AUTHORS -%license COPYING -%if %{without python3} -%{_bindir}/jsonpointer -%endif # without python3 -%{_bindir}/jsonpointer-2* -%{python2_sitelib}/%{pypi_name}.py* -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif # with python2 -%if %{with python3} %files -n python3-%{pypi_name} %doc README.md AUTHORS %license COPYING @@ -113,10 +51,13 @@ ln -s ./jsonpointer-%{python3_version} %{buildroot}%{_bindir}/jsonpointer %{_bindir}/jsonpointer-3* %{python3_sitelib}/__pycache__/* %{python3_sitelib}/%{pypi_name}.py* -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif # with python3 +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ %changelog +* Mon Sep 23 2019 Miro Hrončok - 1.10-18 +- Subpackage python2-jsonpointer has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Thu Aug 15 2019 Miro Hrončok - 1.10-17 - Rebuilt for Python 3.8