From c09d56c2fc01c2ace646be2098bec82306a8d364 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 20:51:34 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-rpm-macros.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 19453b4..2597e1b 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -67,6 +67,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Orion Poplawski 3-6 - Fix typo in %%python_provide From af37c2283549ca22bad8ad6abf569eab15eed5b8 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 12 May 2016 13:28:05 -0500 Subject: [PATCH 2/4] Add single-second sleeps to work around setuptools bug. --- macros.python2 | 3 ++- macros.python3 | 3 ++- python-rpm-macros.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) 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 a633c72..4f44bd1 100644 --- a/macros.python3 +++ b/macros.python3 @@ -8,7 +8,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 2597e1b..8d41746 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -52,7 +52,7 @@ mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %{buildroot}/%{_rpmconfigdir}/macros.d/ - + %files %{_rpmconfigdir}/macros.d/macros.python @@ -67,6 +67,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* 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 From c30072e570c6b8934bbacbb779f12fca337a8e6f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 13 May 2016 14:20:24 -0600 Subject: [PATCH 3/4] Make python-rpm-macros require python-srpm-macros (bug #1335860) --- python-rpm-macros.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 8d41746..7014450 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 8%{?dist} +Release: 9%{?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 Obsoletes: python-macros < 3 Provides: python-macros = %{version}-%{release} @@ -67,6 +69,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* 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. From 81fee785df7a63e04aa22d1571df38a393cd469d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 12 Jul 2016 11:14:21 -0600 Subject: [PATCH 4/4] Do not generate useless Obsoletes with %{?_isa} --- macros.python | 4 ---- python-rpm-macros.spec | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) 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/python-rpm-macros.spec b/python-rpm-macros.spec index 7014450..d63753d 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -69,6 +69,9 @@ 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)