Add pypi_source macro to RDO for compatibility with Fedora

In RDO, we use fedora specs to rebuild dependencies. Some deps are
failing because of missing pypi_source in CentOS7 so let's add it to
openstack-macros in RDO.

Change-Id: I5129260b79c9af4682f90ee7c92a831470312af2
This commit is contained in:
Alfredo Moralejo
2019-02-21 14:32:52 +01:00
parent 837a044f01
commit 27ebbfe338
2 changed files with 49 additions and 2 deletions

View File

@@ -116,4 +116,51 @@ sed -i "s/%{2}/%{1}_tests/g" $tempest_egg_path/PKG-INFO \
%__openstack_set_env %{lua:
rhel_version=tonumber(rpm.expand("0%{?rhel}"))
if rhel_version > 7 then posix.setenv("RHEL_ALLOW_PYTHON2_FOR_BUILD",1) end
}
}
# Compatibility with fedora in CentOS7
# 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

@@ -2,7 +2,7 @@
%global rdo 1
%endif
Name: openstack-macros
Version: 2018.2.7
Version: 2019.1.1
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: {{ license('Apache-2.0') }}