diff --git a/conu.spec b/conu.spec index 1021338..3887d9f 100644 --- a/conu.spec +++ b/conu.spec @@ -1,14 +1,8 @@ %global pypi_name conu -%if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with python3 -%else -%bcond_without python3 -%endif - Name: %{pypi_name} Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: library which makes it easy to write tests for your containers License: GPLv3+ @@ -21,77 +15,12 @@ ExcludeArch: ppc64 # for docs -%if %{with python3} -%endif - %description `conu` is a library which makes it easy to write tests for your containers and is handy when playing with containers inside your code. It defines an API to access and manipulate containers, images and provides more, very helpful functions. -%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) -%package -n python2-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-docker-py -BuildRequires: python-enum34 -BuildRequires: python-kubernetes -Requires: python-kubernetes -Requires: python-docker-py -Requires: python-enum34 -Requires: python-requests -%else -BuildRequires: python2-docker -BuildRequires: python2-enum34 -BuildRequires: python2-kubernetes -Requires: python2-kubernetes -Requires: python2-docker -Requires: python2-enum34 -Requires: python2-requests -%endif -%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: pyxattr -Requires: pyxattr -%else -BuildRequires: python2-pyxattr -Requires: python2-pyxattr -%endif -Requires: python2-six -# this is the only way to create containers right now -Requires: docker -%if 0%{?rhel} && 0%{?rhel} <= 7 -# no s2i on centos :< -# Requires: source-to-image -Requires: acl -Requires: libselinux-utils -%else -# these are optional but still recommended -Recommends: source-to-image -Recommends: acl -Recommends: libselinux-utils -%endif - -%description -n python2-%{pypi_name} -`conu` is a library which makes it easy to write tests for your containers -and is handy when playing with containers inside your code. -It defines an API to access and manipulate containers, -images and provides more, very helpful functions. - -%package -n python2-%{pypi_name}-pytest -Summary: fixtures which can be utilized via pytest -%{?python_provide:%python_provide python2-%{pypi_name}-pytest} -Requires: python2-pytest -Requires: python2-%{pypi_name} - -%description -n python2-%{pypi_name}-pytest -fixtures which can be utilized via pytest -%endif - -%if %{with python3} %package -n python3-%{pypi_name} Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} @@ -128,17 +57,10 @@ Requires: python3-%{pypi_name} %description -n python3-%{pypi_name}-pytest fixtures which can be utilized via pytest -%endif %package -n %{pypi_name}-doc Summary: conu documentation -%if %{with python3} BuildRequires: python3-sphinx -%else -%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: python2-sphinx -%endif # if fedora -%endif # if python3 %description -n %{pypi_name}-doc Documentation for conu. @@ -149,12 +71,7 @@ Documentation for conu. rm -rf %{pypi_name}.egg-info %build -%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) -%py2_build -%endif -%if %{with python3} %py3_build -%endif # generate html docs PYTHONPATH="${PWD}:${PWD}/docs/" sphinx-build docs/source html @@ -162,28 +79,8 @@ PYTHONPATH="${PWD}:${PWD}/docs/" sphinx-build docs/source html rm -rf html/.{doctrees,buildinfo} %install -%if %{with python3} %py3_install -%endif -%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) -%py2_install -%endif -%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) -%files -n python2-%{pypi_name} -%license LICENSE -%doc README.md -%{python2_sitelib}/%{pypi_name}/ -%{python2_sitelib}/%{pypi_name}-*.egg-info/ -%exclude %{python2_sitelib}/tests -%exclude %{python3_sitelib}/fixtures - -%files -n python2-%{pypi_name}-pytest -%license LICENSE -%{python2_sitelib}/%{pypi_name}/fixtures/ -%endif - -%if %{with python3} %files -n python3-%{pypi_name} %license LICENSE %doc README.md @@ -195,20 +92,22 @@ rm -rf html/.{doctrees,buildinfo} %files -n python3-%{pypi_name}-pytest %license LICENSE %{python3_sitelib}/%{pypi_name}/fixtures/ -%endif %files -n %{pypi_name}-doc %doc html %license LICENSE %changelog +* Thu Feb 28 2019 Jiri Popelka - 0.7.1-2 +- remove Python 2 support + * Wed Feb 27 2019 Radoslav Pitoňák 0.7.1-1 - 0.7.1 release * Thu Jan 31 2019 Fedora Release Engineering - 0.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Wed Jan 23 2019 Tomas Tomecek 0.7.0-1 +* Wed Jan 23 2019 Tomas Tomecek 0.7.0-1 - 0.7.0 release * Mon Jan 21 2019 Tomas Tomecek - 0.6.2-2