Attachment 11711 Details for Bug 26801 – makes it take an optional 2nd argument in order to set the obsolete VR in stone

[patch] makes it take an optional 2nd argument in order to set the obsolete VR in stone

0001-rename-take-a-2nd-arg-to-set-the-VR-to-obsolete.patch (text/plain), 1.38 KB, created by Thierry Vignaud on 2020-06-22 15:33:47 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2020-06-22 15:33:47 CEST

Size: 1.38 KB

patch

obsolete

>From 53812343cfcd60f6eaaf12a1f8887d44b91e8459 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Mon, 22 Jun 2020 15:29:10 +0200
>Subject: [PATCH] %rename: take a 2nd arg to set the VR to obsolete
>
>---
> NEWS            | 4 +++-
> build.macros.in | 4 ++--
> 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 :(
>-- 
>2.27.0
>

From 53812343cfcd60f6eaaf12a1f8887d44b91e8459 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 22 Jun 2020 15:29:10 +0200
Subject: [PATCH] %rename: take a 2nd arg to set the VR to obsolete

---
 NEWS            | 4 +++-
 build.macros.in | 4 ++--
 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 :(
-- 
2.27.0

Actions: View | Diff

Attachments on bug 26801: 11703 | 11711