From 323999476ff3f64667f452dcfc6b90c489a27746 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 22 Jun 2020 15:18:47 +0200 Subject: %rename: don't obsolete what is provided (mga#26801) It was already done in commit 5172a8d2bcd354f2d0dcaf8d804ac5bdb0932dc9 but then got reversed in commit 73f9d115e69ab000a2fa4fadd3b4bf31f4c94534 --- NEWS | 2 ++ build.macros.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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_...} -- cgit v1.2.1