Drop forbidden SCL macros

This commit is contained in:
Miro Hrončok 2018-05-17 12:37:49 +02:00
parent 8bdc00fdbe
commit 90ab75af38

View File

@ -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 # Created by pyp2rpm-0.5.1
# if building for SCL or on RHEL, don't build python3- subpackage # if building for SCL or on RHEL, don't build python3- subpackage
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
@ -18,7 +7,7 @@
%endif %endif
%global pypi_name sure %global pypi_name sure
Name: %{?scl_prefix}python-%{pypi_name} Name: python-%{pypi_name}
Version: 1.4.10 Version: 1.4.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: Utility belt for automated testing in Python 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 Source0: https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: %{?scl_prefix}python2-devel BuildRequires: python2-devel
BuildRequires: %{?scl_prefix}python-mock BuildRequires: python-mock
BuildRequires: %{?scl_prefix}python-nose BuildRequires: python-nose
BuildRequires: %{?scl_prefix}python-setuptools BuildRequires: python-setuptools
BuildRequires: %{?scl_prefix}python-six BuildRequires: python-six
Requires: %{?scl_prefix}python-six Requires: python-six
%if 0%{with_python3} %if 0%{with_python3}
BuildRequires: %{?scl_prefix}python3-devel BuildRequires: python3-devel
BuildRequires: %{?scl_prefix}python3-mock BuildRequires: python3-mock
BuildRequires: %{?scl_prefix}python3-nose BuildRequires: python3-nose
BuildRequires: %{?scl_prefix}python3-setuptools BuildRequires: python3-setuptools
BuildRequires: %{?scl_prefix}python3-six BuildRequires: python3-six
%endif %endif
%description %description
@ -59,7 +48,7 @@ heavily inspired by should.js.
%package -n python3-%{pypi_name} %package -n python3-%{pypi_name}
Summary: %{summary} 3 Summary: %{summary} 3
%{?python_provide:%python_provide python3-%{pypi_name}} %{?python_provide:%python_provide python3-%{pypi_name}}
Requires: %{?scl_prefix}python3-six Requires: python3-six
%description -n python3-%{pypi_name} %description -n python3-%{pypi_name}
A testing library for Python with powerful and flexible assertions. Sure is 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 rm -rf %{pypi_name}.egg-info
%build %build
%{?scl:scl enable %{scl} "}
%py2_build %py2_build
%{?scl:"}
%if 0%{with_python3} %if 0%{with_python3}
%py3_build %py3_build
%endif %endif
%install %install
%{?scl:scl enable %{scl} "}
%py2_install %py2_install
%{?scl:"}
%if 0%{?with_python3} %if 0%{?with_python3}
%py3_install %py3_install
%endif # with_python3 %endif # with_python3
%check %check
%{?scl:scl enable %{scl} "}
%{__python2} -m nose --verbosity 2 %{__python2} -m nose --verbosity 2
%{?scl:"}
%if 0%{?with_python3} %if 0%{?with_python3}
%{__python3} -m nose --verbosity 2 %{__python3} -m nose --verbosity 2
@ -116,6 +99,7 @@ rm -rf %{pypi_name}.egg-info
- Stop py3dir pushd/popd, it is not needed - Stop py3dir pushd/popd, it is not needed
- Removed an unneeded shebeng sed - Removed an unneeded shebeng sed
- Drop %%sum macro, use %%summary - Drop %%sum macro, use %%summary
- Drop forbidden SCL macros
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild