diff --git a/python-efel.spec b/python-efel.spec index 9ea841a..e072702 100644 --- a/python-efel.spec +++ b/python-efel.spec @@ -1,12 +1,3 @@ -# https://fedoraproject.org/wiki/Packaging:DistTag?rd=Packaging/DistTag#Conditionals -# http://rpm.org/user_doc/conditional_builds.html -%if 0%{?fedora} >= 30 -# disabled by default -%bcond_with py2 -%else -%bcond_without py2 0 -%endif - # No tests included in package # and since they use versioneer, I'm unable to figure out what git commit this # release comes from @@ -29,7 +20,7 @@ a Python module.} Name: python-%{srcname} Version: 3.0.66 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Electrophys Feature Extraction Library License: LGPLv3 @@ -46,19 +37,10 @@ BuildRequires: gcc-c++ %description %{desc} -%if %{with py2} -%package -n python2-%{srcname} -Summary: %{summary} -BuildRequires: python2-devel -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} -%{desc} -%endif - %package -n python3-%{srcname} Summary: %{summary} BuildRequires: python3-devel +BuildRequires: python3-setuptools %{?python_provide:%python_provide python3-%{srcname}} %description -n python3-%{srcname} @@ -75,20 +57,7 @@ cp -v %{SOURCE2} LGPL %build %py3_build -%if %{with py2} -%py2_build -%endif - %install -# Must do the python2 install first because the scripts in /usr/bin are -# overwritten with every setup.py install, and in general we want the -# python3 version to be the default. -# If, however, we're installing separate executables for python2 and python3, -# the order needs to be reversed so the unversioned executable is the python2 one. -%if %{with py2} -%py2_install -%endif - %py3_install # Remove headers. We won't provide them here. @@ -97,20 +66,9 @@ rm -rf %{buildroot}/%{python3_sitearch}/%{srcname}/cppcore %check %if %{with tests} -%if %{with py2} -%{__python2} setup.py test -%endif %{__python3} setup.py test %endif -%if %{with py2} -%files -n python2-%{srcname} -%license LGPL -%doc README.md LICENSE -%{python2_sitearch}/%{srcname}-%{version}-py2.?.egg-info -%{python2_sitearch}/%{srcname} -%endif - %files -n python3-%{srcname} %license LGPL %doc README.md LICENSE @@ -118,6 +76,10 @@ rm -rf %{buildroot}/%{python3_sitearch}/%{srcname}/cppcore %{python3_sitearch}/%{srcname} %changelog +* Thu Jun 25 2020 Ankur Sinha - 3.0.66-5 +- Remove py2 bits +- Explicitly BR setuptools + * Tue May 26 2020 Miro HronĨok - 3.0.66-4 - Rebuilt for Python 3.9