rpms/python-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Move srpm macros to macros.0python-srpm to be defined before other macros"

Browse Source 
This reverts commit 1a6f8f12f8.
This commit is contained in:
Orion Poplawski 2016-01-14 20:49:29 -07:00
parent 34f5f4c7a4
commit 49ccad99b2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macros.python-srpm Normal file
View File

@ -0,0 +1,8 @@
# 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

9
python-rpm-macros.spec
View File

@ -1,11 +1,11 @@
Name: python-rpm-macros
Version: 3
Release: 6%{?dist}
Release: 5%{?dist}
Summary: The unversioned Python RPM macros
License: MIT
Source0: macros.python
Source1: macros.0python-srpm
Source1: macros.python-srpm
Source2: macros.python2
Source3: macros.python3
@ -57,7 +57,7 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
%{_rpmconfigdir}/macros.d/macros.python
%files -n python-srpm-macros
%{_rpmconfigdir}/macros.d/macros.0python-srpm
%{_rpmconfigdir}/macros.d/macros.python-srpm
%files -n python2-rpm-macros
%{_rpmconfigdir}/macros.d/macros.python2
@ -67,9 +67,6 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
%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
- Handle noarch python sub-packages (bug #1290900)