From 737711641abfbd554f5852e803fcbfda019fdd96 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Jun 25 2017 08:36:47 +0000 Subject: Drop Python 2 build support --- diff --git a/isrcsubmit.spec b/isrcsubmit.spec index dd9cd14..a743d5d 100644 --- a/isrcsubmit.spec +++ b/isrcsubmit.spec @@ -1,9 +1,8 @@ -%bcond_without python3 %{!?python3_pkgversion: %global python3_pkgversion 3} Name: isrcsubmit Version: 2.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Script to submit ISRCs from disc to MusicBrainz License: GPLv3+ @@ -12,7 +11,6 @@ Source0: http://isrcsubmit.jonnyjd.net/downloads/%{name}-%{version}.tar.g Patch0: %{name}-2.0.1-no-setup-requires.patch BuildArch: noarch -%if %{with python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-libdiscid BuildRequires: python%{python3_pkgversion}-musicbrainzngs @@ -20,15 +18,6 @@ BuildRequires: python%{python3_pkgversion}-sphinx Requires: python%{python3_pkgversion}-libdiscid Requires: python%{python3_pkgversion}-musicbrainzngs Requires: python%{python3_pkgversion}-keyring -%else -BuildRequires: python2-devel -BuildRequires: python-libdiscid -BuildRequires: python-musicbrainzngs -BuildRequires: python-sphinx -Requires: python-libdiscid -Requires: python-musicbrainzngs -Requires: python-keyring -%endif %description This python script extracts ISRCs from audio cds and submits them to @@ -43,47 +32,33 @@ and on server), keyring support for login information. %build -%if %{with python3} %py3_build -%else -%py2_build -%endif %install rm -rf $RPM_BUILD_ROOT -%if %{with python3} %py3_install -%else -%py2_install -%endif %check # sys.stdin.encoding can be None in mock, hence override with PYTHONIOENCODING export PYTHONIOENCODING=UTF-8 -%if %{with python3} %{__python3} -Wall setup.py test -%else -%{__python2} -Wall setup.py test -%endif %files %license COPYING %doc AUTHORS CHANGES.markdown README.rst %{_bindir}/isrcsubmit.py -%if %{with python3} %{python3_sitelib}/%{name}-%{version}* -%else -%{python2_sitelib}/%{name}-%{version}* -%endif %{_mandir}/man1/isrcsubmit.1* %{_mandir}/man5/isrcsubmit-config.5* - %changelog +* Sun Jun 25 2017 Ville Skyttä - 2.0.1-8 +- Drop Python 2 build support + * Fri May 26 2017 Ville Skyttä - 2.0.1-7 - Run tests with -Wall - Drop obsolete build conditionals