openstack
/
rpm-packaging
Code Issues Proposed changes

fix provides epoch on singlespec based packages 

without this epoch is never part of provides which fails on comparision
with 'old' epoch based packages

Change-Id: I7c36f3d673725a944996488490e21c01adc9a7c1
This commit is contained in:
Sumit Jamgade 2018-10-15 10:44:41 +02:00
parent 19396860bb
commit cc903f2bf1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack/openstack-macros/macros.openstack-singlespec
View File

@ -590,8 +590,8 @@ end
\
local function print_obsoletes(modname)\
if current_flavor == "python2" then\
print(rpm.expand("Obsoletes: python-" .. modname .. " < %{version}-%{release}\\n"))\
print(rpm.expand("Provides: python-" .. modname .. " = %{version}-%{release}\\n"))\
print(rpm.expand("Obsoletes: python-" .. modname .. " < %{?epoch:%{epoch}:}%{version}-%{release}\\n"))\
print(rpm.expand("Provides: python-" .. modname .. " = %{?epoch:%{epoch}:}%{version}-%{release}\\n"))\
end\
end\
\
@ -682,7 +682,7 @@ end
\
-- before we start, print Provides: python2-modname\
if is_called_python and old_python2 then\
print(rpm.expand("Provides: python2-" .. modname .. " = %{version}-%{release}\\n"))\
print(rpm.expand("Provides: python2-" .. modname .. " = %{?epoch:%{epoch}:}%{version}-%{release}\\n"))\
end\
\
for _,python in ipairs(pythons) do\