aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-06-22 15:18:47 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-06-22 15:20:29 +0200
commit323999476ff3f64667f452dcfc6b90c489a27746 (patch)
tree4c6a9f34b8718460a77a17a5f804ee040b99e9ab
parentb6d9e04421444c4274c663faba0efe86ddc67ac8 (diff)
downloadrpm-setup-323999476ff3f64667f452dcfc6b90c489a27746.tar
rpm-setup-323999476ff3f64667f452dcfc6b90c489a27746.tar.gz
rpm-setup-323999476ff3f64667f452dcfc6b90c489a27746.tar.bz2
rpm-setup-323999476ff3f64667f452dcfc6b90c489a27746.tar.xz
rpm-setup-323999476ff3f64667f452dcfc6b90c489a27746.zip
%rename: don't obsolete what is provided (mga#26801)
It was already done in commit 5172a8d2bcd354f2d0dcaf8d804ac5bdb0932dc9 but then got reversed in commit 73f9d115e69ab000a2fa4fadd3b4bf31f4c94534
-rw-r--r--NEWS2
-rw-r--r--build.macros.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index bab2688..d0edc1f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- %rename: don't obsolete what is provided (mga#26801)
+
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 b9a0143..318e8c9 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -320,7 +320,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# Macro from conectiva
%rename() \
-Obsoletes: %{1} <= %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} \
+Obsoletes: %{1} < %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} \
Provides: %{1} = %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release}
# Shorthand for %{defined with_...}