diff --git a/python-pymilter.spec b/python-pymilter.spec index 245f2dd..f5fbe08 100644 --- a/python-pymilter.spec +++ b/python-pymilter.spec @@ -8,14 +8,16 @@ %endif %if 0%{?fedora} > 32 %bcond_with python2 +%global python2 python27 %else %bcond_without python2 +%global python2 python2 %endif Summary: %{sum} Name: python-pymilter Version: 1.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Url: http://bmsi.com/pymilter Source: https://github.com/sdgathman/pymilter/archive/pymilter-%{version}.tar.gz Source1: tmpfiles-python-pymilter.conf @@ -23,7 +25,7 @@ Source1: tmpfiles-python-pymilter.conf Patch: pymilter-check.patch License: GPLv2+ Group: Development/Libraries -BuildRequires: python2-devel, %{python3}-devel, sendmail-devel >= 8.13 +BuildRequires: %{python3}-devel, sendmail-devel >= 8.13 # python-2.6.4 gets RuntimeError: not holding the import lock # Need python2.6 specific pydns, not the version for system python BuildRequires: gcc @@ -37,16 +39,16 @@ DSNs, and doing CBV. %description %_description %if %{with python2} -%package -n python2-pymilter +%package -n %{python2}-pymilter Summary: %{sum} %if 0%{?epel} >= 6 Requires: python-pydns %else -Requires: python2-pydns +Requires: %{python2}-pydns %endif Requires: %{name}-common = %{version}-%{release} -%{?python_provide:%python_provide python2-pymilter} -BuildRequires: python2-devel, +%{?python_provide:%python_provide %{python2}-pymilter} +BuildRequires: %{python2}-devel %description -n python2-pymilter %_description %endif @@ -123,7 +125,7 @@ py3path=$(ls -d build/lib.linux-*-3.*) PYTHONPATH=${py3path}:. python3 test.py %if %{with python2} -%files -n python2-pymilter +%files -n %{python2}-pymilter %license COPYING %doc README ChangeLog NEWS TODO CREDITS sample.py milter-template.py %{python2_sitearch}/* @@ -154,6 +156,9 @@ if [ $1 -eq 0 ] ; then fi %changelog +* Tue Oct 29 2019 Stuart Gathman - 1.0.4-6 +- Remove dup py2 BR + * Tue Oct 29 2019 Stuart Gathman - 1.0.4-5 - Default to not build python2 beginning f32