Use release instead of baserelease for glibc32 conflict
This is necessary because %{baserelease} < %{release}, so the previous Obsoletes: clause did not match an installed glibc32 package from the same build. (cherry picked from commit add3da24f037a9d934eaeb9a6c246a45d3a716cc)
This commit is contained in:
parent
9dd8b289e9
commit
0b92ae19ae
@ -439,8 +439,8 @@ Recommends: (nss_db(x86-32) if nss_db(x86-64))
|
||||
Recommends: (nss_hesiod(x86-32) if nss_hesiod(x86-64))
|
||||
# Deinstall the glibc32 package if present. This helps tests that do
|
||||
# not run against the compose.
|
||||
Conflicts: glibc32 <= %{version}-%{baserelease}
|
||||
Obsoletes: glibc32 <= %{version}-%{baserelease}
|
||||
Conflicts: glibc32 <= %{version}-%{release}
|
||||
Obsoletes: glibc32 <= %{version}-%{release}
|
||||
%endif
|
||||
|
||||
# This is for building auxiliary programs like memusage
|
||||
|
Loading…
Reference in New Issue
Block a user