Move srpm macros to macros.0python-srpm to be defined before other macros
This commit is contained in:
parent
2553290f93
commit
1a6f8f12f8
@ -1,8 +0,0 @@
|
|||||||
# python3_pkgversion specifies the version of Python 3 in the distro. It can be
|
|
||||||
# a specific version (e.g. 34 in Fedora EPEL7)
|
|
||||||
%python3_pkgversion 3
|
|
||||||
|
|
||||||
# Set to /bin/true to avoid %ifdefs and %{? in specfiles
|
|
||||||
%__python3_other /bin/true
|
|
||||||
%py3_other_build /bin/true
|
|
||||||
%py3_other_install /bin/true
|
|
@ -1,11 +1,11 @@
|
|||||||
Name: python-rpm-macros
|
Name: python-rpm-macros
|
||||||
Version: 3
|
Version: 3
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: The unversioned Python RPM macros
|
Summary: The unversioned Python RPM macros
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
Source0: macros.python
|
Source0: macros.python
|
||||||
Source1: macros.python-srpm
|
Source1: macros.0python-srpm
|
||||||
Source2: macros.python2
|
Source2: macros.python2
|
||||||
Source3: macros.python3
|
Source3: macros.python3
|
||||||
|
|
||||||
@ -57,7 +57,7 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
|
|||||||
%{_rpmconfigdir}/macros.d/macros.python
|
%{_rpmconfigdir}/macros.d/macros.python
|
||||||
|
|
||||||
%files -n python-srpm-macros
|
%files -n python-srpm-macros
|
||||||
%{_rpmconfigdir}/macros.d/macros.python-srpm
|
%{_rpmconfigdir}/macros.d/macros.0python-srpm
|
||||||
|
|
||||||
%files -n python2-rpm-macros
|
%files -n python2-rpm-macros
|
||||||
%{_rpmconfigdir}/macros.d/macros.python2
|
%{_rpmconfigdir}/macros.d/macros.python2
|
||||||
@ -67,6 +67,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-6
|
||||||
|
- Move srpm macros to macros.0python-srpm to be defined before other macros
|
||||||
|
|
||||||
* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-5
|
* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-5
|
||||||
- Handle noarch python sub-packages (bug #1290900)
|
- Handle noarch python sub-packages (bug #1290900)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user