Merge branch 'master' into epel7

Conflicts:
	macros.python
	macros.python-srpm
	python-rpm-macros.spec
This commit is contained in:
Orion Poplawski 2016-01-14 16:22:53 -07:00
commit 68a7e6e10b
3 changed files with 15 additions and 7 deletions

View file

@ -2,7 +2,8 @@
# a specific version (e.g. 34 in Fedora EPEL7)
%python3_pkgversion 34
#python3_other_pkgversion 35
# Set to /bin/true when not active to avoid %ifdefs in specfiles
# Set to /bin/true when not active to avoid %ifdefs and %{? in specfiles
%__python3_other /bin/true
%py3_other_build /bin/true
%py3_other_install /bin/true