Add %pypi_source macro.

Also fixed typo in changelog version from previous commit.
This commit is contained in:
Jason Tibbitts 2018-06-18 17:54:00 -05:00
parent 910a7dfd4d
commit a299eaadad
2 changed files with 49 additions and 2 deletions

View File

@ -61,3 +61,47 @@
end\
}
# Macro to replace overly complicated references to PyPI source files.
# Expands to the pythonhosted URL for a package
# Accepts zero to three arguments:
# 1: The PyPI project name, defaulting to %srcname if it is defined, then
# %pypi_name if it is defined, then just %name.
# 2: The PYPI version, defaulting to %version.
# 3: The file extension, defaulting to "tar.gz". (A period will be added
# automatically.)
# Requires %__pypi_url and %__pypi_default_extension to be defined.
%__pypi_url https://files.pythonhosted.org/packages/source/
%__pypi_default_extension tar.gz
%pypi_source() %{lua:
local src = rpm.expand('%1')
local ver = rpm.expand('%2')
local ext = rpm.expand('%3')
local url = rpm.expand('%__pypi_url')
\
-- If no first argument, try %srcname, then %pypi_name, then %name
-- Note that rpm leaves macros unchanged if they are not defined.
if src == '%1' then
src = rpm.expand('%srcname')
end
if src == '%srcname' then
src = rpm.expand('%pypi_name')
end
if src == '%pypi_name' then
src = rpm.expand('%name')
end
\
-- If no second argument, use %version
if ver == '%2' then
ver = rpm.expand('%version')
end
\
-- If no third argument, use the preset default extension
if ext == '%3' then
ext = rpm.expand('%__pypi_default_extension')
end
\
local first = string.sub(src, 1, 1)
\
print(url .. first .. '/' .. src .. '/' .. src .. '-' .. ver .. '.' .. ext)
}

View File

@ -1,6 +1,6 @@
Name: python-rpm-macros
Version: 3
Release: 24%{?dist}
Release: 25%{?dist}
Summary: The unversioned Python RPM macros
License: MIT
@ -78,7 +78,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
%{rpmmacrodir}/macros.platform-python
%changelog
* Fri Jan 19 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3-25
* Mon Jun 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3-25
- Add %%pypi_source macro.
* Fri Jan 19 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3-24
- Add %%python_enable_dependency_generator
* Thu Oct 26 2017 Ville Skyttä <ville.skytta@iki.fi> - 3-23