Merge branch 'master' into epel7
This commit is contained in:
commit
87acff351c
@ -25,10 +25,6 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
|
|||||||
print(" = ");\
|
print(" = ");\
|
||||||
print(vr);\
|
print(vr);\
|
||||||
--Obsoleting the previous default python package\
|
--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("\\nObsoletes: python-");\
|
||||||
print(string.sub(package,9,string.len(package)));\
|
print(string.sub(package,9,string.len(package)));\
|
||||||
print(" < ");\
|
print(" < ");\
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
%py2_shbang_opts -s
|
%py2_shbang_opts -s
|
||||||
|
|
||||||
%py2_build() %{expand:\
|
%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:\
|
%py2_install() %{expand:\
|
||||||
|
@ -10,7 +10,8 @@
|
|||||||
%py3_shbang_opts -s
|
%py3_shbang_opts -s
|
||||||
|
|
||||||
%py3_build() %{expand:\
|
%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:\
|
%py3_install() %{expand:\
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: python-rpm-macros
|
Name: python-rpm-macros
|
||||||
Version: 3
|
Version: 3
|
||||||
Release: 6%{?dist}.1
|
Release: 10%{?dist}
|
||||||
Summary: The unversioned Python RPM macros
|
Summary: The unversioned Python RPM macros
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -10,6 +10,8 @@ Source2: macros.python2
|
|||||||
Source3: macros.python3
|
Source3: macros.python3
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
# For %%python3_pkgversion used in %%python_provide
|
||||||
|
Requires: python-srpm-macros
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the unversioned Python RPM macros, that most
|
This package contains the unversioned Python RPM macros, that most
|
||||||
@ -61,6 +63,18 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 12 2016 Orion Poplawski <orion@cora.nwra.com> 3-10
|
||||||
|
- Do not generate useless Obsoletes with %%{?_isa}
|
||||||
|
|
||||||
|
* Fri May 13 2016 Orion Poplawski <orion@cora.nwra.com> 3-9
|
||||||
|
- Make python-rpm-macros require python-srpm-macros (bug #1335860)
|
||||||
|
|
||||||
|
* Thu May 12 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 3-8
|
||||||
|
- Add single-second sleeps to work around setuptools bug.
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Jan 25 2016 Orion Poplawski <orion@cora.nwra.com> 3-6.1
|
* Mon Jan 25 2016 Orion Poplawski <orion@cora.nwra.com> 3-6.1
|
||||||
- Set %%__python3 to /usr/bin/python3.4
|
- Set %%__python3 to /usr/bin/python3.4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user