aboutsummaryrefslogtreecommitdiffstats
path: root/build.macros.in
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-06-22 15:29:10 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-06-23 09:46:26 +0200
commitfdbe4103d884811cdf71dbe0411f591f14ade087 (patch)
tree0b38bb058e2ba0b05509e369d3cc90abd79a9338 /build.macros.in
parent323999476ff3f64667f452dcfc6b90c489a27746 (diff)
downloadrpm-setup-fdbe4103d884811cdf71dbe0411f591f14ade087.tar
rpm-setup-fdbe4103d884811cdf71dbe0411f591f14ade087.tar.gz
rpm-setup-fdbe4103d884811cdf71dbe0411f591f14ade087.tar.bz2
rpm-setup-fdbe4103d884811cdf71dbe0411f591f14ade087.tar.xz
rpm-setup-fdbe4103d884811cdf71dbe0411f591f14ade087.zip
%rename: take a 2nd arg to set the VR to obsolete
See mga#26801 too
Diffstat (limited to 'build.macros.in')
-rw-r--r--build.macros.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.macros.in b/build.macros.in
index 318e8c9..bcbce72 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -320,8 +320,8 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# Macro from conectiva
%rename() \
-Obsoletes: %{1} < %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} \
-Provides: %{1} = %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release}
+Obsoletes: %{1} < %{?2:%2}%{?!2:%{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release}} \
+Provides: %{1} = %{?2:%2}%{?!2:%{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release}}
# Shorthand for %{defined with_...}
# macros provided by rpm 4.4, but buggy :(