Move "sleep 1" workaround from py3_build to py2_build
https://bugzilla.redhat.com/show_bug.cgi?id=1644923
This commit is contained in:
parent
beaa2eec4f
commit
c8932dcbef
|
@ -7,19 +7,24 @@
|
||||||
|
|
||||||
# Use the slashes after expand so that the command starts on the same line as
|
# Use the slashes after expand so that the command starts on the same line as
|
||||||
# the macro
|
# the macro
|
||||||
|
# The `sleep 1` commands work around a race in install; see:
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1644923
|
||||||
%py2_build() %{expand:\\\
|
%py2_build() %{expand:\\\
|
||||||
|
sleep 1
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||||
%{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?*}
|
%{__python2} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py2_shbang_opts}" %{?*}
|
||||||
sleep 1
|
sleep 1
|
||||||
}
|
}
|
||||||
|
|
||||||
%py2_build_egg() %{expand:\\\
|
%py2_build_egg() %{expand:\\\
|
||||||
|
sleep 1
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||||
%{__python2} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
|
%{__python2} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
|
||||||
sleep 1
|
sleep 1
|
||||||
}
|
}
|
||||||
|
|
||||||
%py2_build_wheel() %{expand:\\\
|
%py2_build_wheel() %{expand:\\\
|
||||||
|
sleep 1
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||||
%{__python2} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
|
%{__python2} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
|
@ -12,19 +12,16 @@
|
||||||
%py3_build() %{expand:\\\
|
%py3_build() %{expand:\\\
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||||
%{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*}
|
%{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*}
|
||||||
sleep 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%py3_build_egg() %{expand:\\\
|
%py3_build_egg() %{expand:\\\
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||||
%{__python3} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
|
%{__python3} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
|
||||||
sleep 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%py3_build_wheel() %{expand:\\\
|
%py3_build_wheel() %{expand:\\\
|
||||||
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
|
||||||
%{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
|
%{__python3} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
|
||||||
sleep 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%py3_install() %{expand:\\\
|
%py3_install() %{expand:\\\
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Name: python-rpm-macros
|
Name: python-rpm-macros
|
||||||
Version: 3
|
Version: 3
|
||||||
Release: 38%{?dist}
|
Release: 39%{?dist}
|
||||||
Summary: The unversioned Python RPM macros
|
Summary: The unversioned Python RPM macros
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
|
@ -73,6 +73,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 01 2018 Petr Viktorin <pviktori@redhat.com> - 3-39
|
||||||
|
- Move "sleep 1" workaround from py3_build to py2_build (#1644923)
|
||||||
|
|
||||||
* Thu Sep 20 2018 Tomas Orsava <torsava@redhat.com> - 3-38
|
* Thu Sep 20 2018 Tomas Orsava <torsava@redhat.com> - 3-38
|
||||||
- Move the __python2/3 macros to the python-srpm-macros subpackage
|
- Move the __python2/3 macros to the python-srpm-macros subpackage
|
||||||
- This facilitates using the %%{__python2/3} in Build/Requires
|
- This facilitates using the %%{__python2/3} in Build/Requires
|
||||||
|
|
Loading…
Reference in New Issue