diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-06-22 15:29:10 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-06-23 09:46:26 +0200 |
| commit | fdbe4103d884811cdf71dbe0411f591f14ade087 (patch) | |
| tree | 0b38bb058e2ba0b05509e369d3cc90abd79a9338 | |
| parent | 323999476ff3f64667f452dcfc6b90c489a27746 (diff) | |
| download | rpm-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
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | build.macros.in | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -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 :( |