From 9c6ffb4c52397472961e662b191a275a90b3fa7e Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: May 28 2019 13:04:48 +0000 Subject: Merge downstream spec changes Including Python 2 Drop --- diff --git a/python-resultsdb_api.spec b/python-resultsdb_api.spec index 2454e88..21dc3e0 100644 --- a/python-resultsdb_api.spec +++ b/python-resultsdb_api.spec @@ -1,12 +1,12 @@ Name: python-resultsdb_api # NOTE: if you update version, *make sure* to also update `setup.py` Version: 2.1.2 -Release: 1%{?dist} +Release: 5%{?dist} Summary: Interface api to ResultsDB License: GPLv2+ URL: https://pagure.io/taskotron/resultsdb_api -Source0: https://qa.fedoraproject.org/releases/resultsdb_api/resultsdb_api-%{version}.tar.gz +Source0: https://qa.fedoraproject.org/releases/resultsdb_api/python-resultsdb_api-%{version}.tar.gz BuildArch: noarch @@ -17,40 +17,6 @@ Interface api to ResultsDB %description %_description -# ********* Python 2 package ********** - -%package -n python2-resultsdb_api -Summary: %summary -Requires: python2-simplejson - -%if 0%{?fedora} -Requires: python2-requests -%else -Requires: python-requests -%endif - -BuildRequires: python2-devel -BuildRequires: python2-pytest-cov -BuildRequires: python2-setuptools -BuildRequires: python2-simplejson - -%if 0%{?fedora} -BuildRequires: python2-pytest -BuildRequires: python2-requests -BuildRequires: python2-virtualenv -%else -BuildRequires: pytest -BuildRequires: python-requests -BuildRequires: python-virtualenv -%endif - -%description -n python2-resultsdb_api %_description - -# ************************************* - - -%if 0%{?fedora} -# ********* Python 3 package ********** %package -n python3-resultsdb_api Summary: %summary Requires: python3-simplejson @@ -65,11 +31,9 @@ BuildRequires: python3-requests BuildRequires: python3-virtualenv %description -n python3-resultsdb_api %_description -# ************************************* -%endif %prep -%setup -q -n resultsdb_api-%{version} +%setup -q -n python-resultsdb_api-%{version} %check ## FIXME: fix the test suite @@ -77,33 +41,33 @@ BuildRequires: python3-virtualenv # make test %build -%py2_build -%if 0%{?fedora} %py3_build -%endif %install -%py2_install -%if 0%{?fedora} %py3_install -%endif - -%files -n python2-resultsdb_api -%doc README.md -%license LICENSE -%{python2_sitelib}/resultsdb_api.* -%{python2_sitelib}/*.egg-info -%if 0%{?fedora} %files -n python3-resultsdb_api %doc README.md %license LICENSE %{python3_sitelib}/resultsdb_api.* %{python3_sitelib}/__pycache__/resultsdb_api.* %{python3_sitelib}/*.egg-info -%endif %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Frantisek Zatloukal - 2.1.2-4 +- Drop Python 2 subpackage +- Clean spec +- Update Source0 url + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.1.2-2 +- Rebuilt for Python 3.7 + * Mon Jun 11 2018 Frantisek Zatloukal - 2.1.2-1 - Python 3 subpacakage for Fedora - Drop dependency on python-six