diff --git a/.gitignore b/.gitignore index 58fa7cf..bf5e7b7 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /fedfind-4.2.7.tar.gz /fedfind-4.2.8.tar.gz /fedfind-4.3.0.tar.gz +/fedfind-4.4.1.tar.gz diff --git a/fedfind.spec b/fedfind.spec index 7f30302..c2cde06 100644 --- a/fedfind.spec +++ b/fedfind.spec @@ -1,11 +1,5 @@ -# Enable Python 3 builds for Fedora + EPEL >6 -%if 0%{?fedora} || 0%{?rhel} > 6 # If the definition isn't available for python3_pkgversion, define it %{?!python3_pkgversion:%global python3_pkgversion 3} -%bcond_without python3 -%else -%bcond_with python3 -%endif # Disable Python 2 builds for Fedora > 29, EPEL > 7 %if 0%{?fedora} > 29 || 0%{?rhel} > 7 @@ -23,8 +17,8 @@ %global srcname fedfind Name: fedfind -Version: 4.3.0 -Release: 2%{?dist} +Version: 4.4.1 +Release: 1%{?dist} Summary: Fedora compose and image finder License: GPLv3+ @@ -39,25 +33,13 @@ BuildRequires: python2-pytest BuildRequires: python2-mock BuildRequires: %{test_requires2} %endif # if with_python2 -%if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-freezegun BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-mock BuildRequires: %{test_requires3} -%endif # if with_python3 -# Required on EL 6 but no longer provided on F>25, hence this annoying -# conditional -%if 0%{?rhel} && 0%{?rhel} < 7 -BuildRequires: python-argparse -Requires: python-argparse -%endif # rhel < 7 -%if 0%{?with_python3} Requires: python%{python3_pkgversion}-fedfind -%else -Requires: python2-fedfind -%endif %description Fedora Finder finds Fedora. For now, that means it finds Fedora images @@ -82,7 +64,6 @@ them, along with some miscellaneous helper functions. This is the Python 2 library package. %endif # if with_python2 -%if 0%{?with_python3} %package -n python%{python3_pkgversion}-fedfind Summary: Fedora Finder finds Fedora (using Python 3) %{?python_provide:%python_provide python%{python3_pkgversion}-fedfind} @@ -98,28 +79,23 @@ nightly composes. The fedfind library provides a handy interface for interacting with Fedora composes and discovering various properties of them, along with some miscellaneous helper functions. This is the Python 3 library package. -%endif # with_python3 %prep %autosetup -n %{srcname}-%{version} -p1 # this is needed for doing sdist, but not for anything else sed -i -e '/setuptools_git/d' setup.py -%if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!.*python2|#!%{__python3}|' -%endif # with_python3 %build %if 0%{?with_python2} %py2_build %endif # with_python2 -%if 0%{?with_python3} pushd %{py3dir} %py3_build popd -%endif # with_python3 %install rm -rf %{buildroot} @@ -129,23 +105,17 @@ rm -rf %{buildroot} %if 0%{?with_python2} %py2_install %endif # with_python2 -%if 0%{?with_python3} pushd %{py3dir} %py3_install popd -%endif # with_python3 - %check %if 0%{?with_python2} %{__python2} setup.py test %endif # with_python2 - -%if 0%{?with_python3} pushd %{py3dir} %{__python3} setup.py test popd -%endif # with_python3 %files %doc README.md CHANGELOG.md @@ -159,15 +129,17 @@ popd %{python2_sitelib}/%{srcname}* %endif # with_python2 -%if 0%{?with_python3} %files -n python%{python3_pkgversion}-fedfind %doc README.md CHANGELOG.md %license COPYING %{python3_sitelib}/%{srcname}* -%endif # with_python3 %changelog +* Fri Feb 21 2020 Adam Williamson - 4.4.1-1 +- New release 4.4.1: drop Python 2.6 support, update tests, use Bodhi not pkgdb +- Simplify spec by dropping EL 6 support (can't build on EL 6 now anyway) + * Tue Jan 28 2020 Fedora Release Engineering - 4.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 25abcf0..112e01c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fedfind-4.3.0.tar.gz) = cad6ce20f5b14327c46751064b3d4f6b4ab222e03d5c49b38b37cb6accb9f4c75c50d07780bc3ef54d3ed3c4ed6cc5a2d47e331de00c546848ef48d07f27af6b +SHA512 (fedfind-4.4.1.tar.gz) = a94aab350c120b91245a610dc7dc03ee0252cda6c814927448c9b7884e294e6bec4439dc0224aaaeeaf310d3a80f9b767076431c11c0433d727ca5ff76dd7c19