diff --git a/python-kdcproxy.spec b/python-kdcproxy.spec index 205e82e..7869b90 100644 --- a/python-kdcproxy.spec +++ b/python-kdcproxy.spec @@ -1,20 +1,8 @@ %global realname kdcproxy -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%else -%global with_python3 0 -%endif - -%if 0%{?fedora} || 0%{?rhel} <= 7 -%global with_python2 1 -%else -%global with_python2 0 -%endif - Name: python-%{realname} Version: 0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MS-KKDCP (kerberos proxy) WSGI module License: MIT @@ -26,23 +14,12 @@ Patch0: Make-webtest-an-optional-dependency.patch BuildArch: noarch BuildRequires: git -%if 0%{?with_python2} > 0 -BuildRequires: python2-devel -BuildRequires: python2-pytest -BuildRequires: python2-coverage -BuildRequires: python2-asn1crypto -BuildRequires: python2-dns -BuildRequires: python2-mock -%endif - -%if 0%{?with_python3} > 0 BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: python3-coverage BuildRequires: python3-asn1crypto BuildRequires: python3-dns BuildRequires: python3-mock -%endif %description @@ -50,21 +27,6 @@ This package contains a Python WSGI module for proxying KDC requests over HTTP by following the MS-KKDCP protocol. It aims to be simple to deploy, with minimal configuration. -%if 0%{?with_python2} > 0 -%package -n python2-%{realname} -Summary: MS-KKDCP (kerberos proxy) WSGI module -Requires: python2-dns -Requires: python2-asn1crypto - -%{?python_provide:%python_provide python2-%{realname}} - -%description -n python2-%{realname} -This package contains a Python 2.x WSGI module for proxying KDC requests over -HTTP by following the MS-KKDCP protocol. It aims to be simple to deploy, with -minimal configuration. -%endif - -%if 0%{?with_python3} > 0 %package -n python3-%{realname} Summary: MS-KKDCP (kerberos proxy) WSGI module Requires: python3-dns @@ -76,53 +38,30 @@ Requires: python3-asn1crypto This package contains a Python 3.x WSGI module for proxying KDC requests over HTTP by following the MS-KKDCP protocol. It aims to be simple to deploy, with minimal configuration. -%endif %prep %autosetup -S git -n %{realname}-%{version} - %build -%if 0%{?with_python2} > 0 -%py2_build -%endif -%if 0%{?with_python3} > 0 %py3_build -%endif %install -%if 0%{?with_python2} > 0 -%py2_install -%endif -%if 0%{?with_python3} > 0 %py3_install -%endif %check -%if 0%{?with_python2} > 0 -KDCPROXY_ASN1MOD=asn1crypto %{__python2} -m pytest -%endif -%if 0%{?with_python3} > 0 KDCPROXY_ASN1MOD=asn1crypto %{__python3} -m pytest -%endif -%if 0%{?with_python2} > 0 -%files -n python2-%{realname} -%doc README -%license COPYING -%{python2_sitelib}/%{realname}/ -%{python2_sitelib}/%{realname}-%{version}-*.egg-info -%endif - -%if 0%{?with_python3} > 0 %files -n python3-%{realname} %doc README %license COPYING %{python3_sitelib}/%{realname}/ %{python3_sitelib}/%{realname}-%{version}-*.egg-info -%endif %changelog +* Mon Sep 17 2018 Robbie Harwood - 0.4-3 +- Drop python2 subpackage +- Resolves: #1629775 + * Thu Aug 09 2018 Robbie Harwood - 0.4-2 - Update dependencies in test suite