aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--build.macros.in4
2 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index d0edc1f..d5bbcdf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
-- %rename: don't obsolete what is provided (mga#26801)
+- %rename:
+ o don't obsolete what is provided (mga#26801)
+ o take a 2nd arg to set the VR to obsolete
Version 2.56 - 1 June 2020, by Jani Välimaa
- build.macros: add _configure_gnuconfig_hack macro based on one from Fedora to update config.{guess,sub}
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 :(