diff --git a/macros.python b/macros.python index 0a7ed0a..94e769c 100644 --- a/macros.python +++ b/macros.python @@ -25,10 +25,6 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski print(" = ");\ print(vr);\ --Obsoleting the previous default python package\ - if (rpm.expand("%{?buildarch}") ~= "noarch") then\ - str = "\\nObsoletes: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} < " .. vr;\ - print(rpm.expand(str));\ - end\ print("\\nObsoletes: python-");\ print(string.sub(package,9,string.len(package)));\ print(" < ");\ diff --git a/macros.python2 b/macros.python2 index 6bfd7f8..789ca09 100644 --- a/macros.python2 +++ b/macros.python2 @@ -7,7 +7,8 @@ %py2_shbang_opts -s %py2_build() %{expand:\ -CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?1}\ +CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?1};\ +sleep 1\ } %py2_install() %{expand:\ diff --git a/macros.python3 b/macros.python3 index 7f00724..2ef1fe7 100644 --- a/macros.python3 +++ b/macros.python3 @@ -10,7 +10,8 @@ %py3_shbang_opts -s %py3_build() %{expand:\ -CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?1}\ +CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?1};\ +sleep 1\ } %py3_install() %{expand:\ diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index b720e8d..51b5e40 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 6%{?dist}.1 +Release: 10%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -10,6 +10,8 @@ Source2: macros.python2 Source3: macros.python3 BuildArch: noarch +# For %%python3_pkgversion used in %%python_provide +Requires: python-srpm-macros %description This package contains the unversioned Python RPM macros, that most @@ -46,7 +48,7 @@ mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %{buildroot}/%{_rpmconfigdir}/macros.d/ - + %files %{_rpmconfigdir}/macros.d/macros.python @@ -61,6 +63,18 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* Tue Jul 12 2016 Orion Poplawski 3-10 +- Do not generate useless Obsoletes with %%{?_isa} + +* Fri May 13 2016 Orion Poplawski 3-9 +- Make python-rpm-macros require python-srpm-macros (bug #1335860) + +* Thu May 12 2016 Jason L Tibbitts III - 3-8 +- Add single-second sleeps to work around setuptools bug. + +* Thu Feb 04 2016 Fedora Release Engineering - 3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 25 2016 Orion Poplawski 3-6.1 - Set %%__python3 to /usr/bin/python3.4