From 90ab75af3875aee6494b30b52fecdc36628117c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 17 May 2018 12:37:49 +0200 Subject: [PATCH] Drop forbidden SCL macros --- python-sure.spec | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/python-sure.spec b/python-sure.spec index 79a8ffa..e53076d 100644 --- a/python-sure.spec +++ b/python-sure.spec @@ -1,14 +1,3 @@ -# This package contains macros that provide functionality relating to -# Software Collections. These macros are not used in default -# Fedora builds, and should not be blindly copied or enabled. -# Specifically, the "scl" macro must not be defined in official Fedora -# builds. For more information, see: -# http://docs.fedoraproject.org/en-US/Fedora_Contributor_Documentation -# /1/html/Software_Collections_Guide/index.html - -%{?scl:%scl_package python-%{pypi_name}} -%{!?scl:%global pkg_name %{name}} - # Created by pyp2rpm-0.5.1 # if building for SCL or on RHEL, don't build python3- subpackage %if 0%{?fedora} || 0%{?rhel} > 7 @@ -18,7 +7,7 @@ %endif %global pypi_name sure -Name: %{?scl_prefix}python-%{pypi_name} +Name: python-%{pypi_name} Version: 1.4.10 Release: 1%{?dist} Summary: Utility belt for automated testing in Python @@ -28,19 +17,19 @@ URL: https://github.com/gabrielfalcao/sure Source0: https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: %{?scl_prefix}python2-devel -BuildRequires: %{?scl_prefix}python-mock -BuildRequires: %{?scl_prefix}python-nose -BuildRequires: %{?scl_prefix}python-setuptools -BuildRequires: %{?scl_prefix}python-six -Requires: %{?scl_prefix}python-six +BuildRequires: python2-devel +BuildRequires: python-mock +BuildRequires: python-nose +BuildRequires: python-setuptools +BuildRequires: python-six +Requires: python-six %if 0%{with_python3} -BuildRequires: %{?scl_prefix}python3-devel -BuildRequires: %{?scl_prefix}python3-mock -BuildRequires: %{?scl_prefix}python3-nose -BuildRequires: %{?scl_prefix}python3-setuptools -BuildRequires: %{?scl_prefix}python3-six +BuildRequires: python3-devel +BuildRequires: python3-mock +BuildRequires: python3-nose +BuildRequires: python3-setuptools +BuildRequires: python3-six %endif %description @@ -59,7 +48,7 @@ heavily inspired by should.js. %package -n python3-%{pypi_name} Summary: %{summary} 3 %{?python_provide:%python_provide python3-%{pypi_name}} -Requires: %{?scl_prefix}python3-six +Requires: python3-six %description -n python3-%{pypi_name} A testing library for Python with powerful and flexible assertions. Sure is @@ -72,27 +61,21 @@ heavily inspired by should.js. rm -rf %{pypi_name}.egg-info %build -%{?scl:scl enable %{scl} "} %py2_build -%{?scl:"} %if 0%{with_python3} %py3_build %endif %install -%{?scl:scl enable %{scl} "} %py2_install -%{?scl:"} %if 0%{?with_python3} %py3_install %endif # with_python3 %check -%{?scl:scl enable %{scl} "} %{__python2} -m nose --verbosity 2 -%{?scl:"} %if 0%{?with_python3} %{__python3} -m nose --verbosity 2 @@ -116,6 +99,7 @@ rm -rf %{pypi_name}.egg-info - Stop py3dir pushd/popd, it is not needed - Removed an unneeded shebeng sed - Drop %%sum macro, use %%summary +- Drop forbidden SCL macros * Fri Feb 09 2018 Fedora Release Engineering - 1.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild