From e2cc43584edf839c82cf9eec594f42d8a675251e Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 4 Oct 2019 10:17:05 +0200 Subject: [PATCH] always install python2-setuptools if python2 is enabled ... to fix the following build failure on Fedora rawhide: + cd python + CFLAGS='-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection' + /usr/bin/python2 setup.py build Traceback (most recent call last): File "setup.py", line 5, in from setuptools import setup ImportError: No module named setuptools RPM build errors: error: Bad exit status from /var/tmp/rpm-tmp.BWebEV (%build) --- file.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/file.spec b/file.spec index e7d4ab7..dea1d10 100644 --- a/file.spec +++ b/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.37 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -67,9 +67,7 @@ The file-static package contains the static version of the libmagic library. %package -n python2-magic Summary: Python 2 bindings for the libmagic API BuildRequires: python2-devel -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-setuptools -%endif +BuildRequires: python2-setuptools BuildArch: noarch Requires: %{name} = %{version}-%{release} %{?python_provide:%python_provide python2-magic} @@ -205,6 +203,9 @@ cd %{py3dir} %endif %changelog +* Fri Oct 04 2019 Kamil Dudka - 5.37-6 +- always install python2-setuptools if python2 is enabled + * Thu Oct 03 2019 Miro Hrončok - 5.37-5 - Rebuilt for Python 3.8.0rc1 (#1748018)