From fe014dfd31d951037e9b52d56ce1d7639aeb21dea462aa7910080a0c24b64c23 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 30 Sep 2021 13:02:32 +0000 Subject: [PATCH] Accepting request 922315 from home:dimstar:Factory - Do not query %{verbose} to add V=1 or not: verbose changed semantics between rpm versions and there is currently no variant supporting rpm < 4.17 and rpm >= 4.17. OBS-URL: https://build.opensuse.org/request/show/922315 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=63 --- patch.changes | 7 +++++++ patch.spec | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/patch.changes b/patch.changes index a0cf9e3..763b7aa 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 29 10:33:36 UTC 2021 - Dominique Leuenberger + +- Do not query %{verbose} to add V=1 or not: verbose changed + semantics between rpm versions and there is currently no variant + supporting rpm < 4.17 and rpm >= 4.17. + ------------------------------------------------------------------- Wed May 9 09:52:04 UTC 2018 - jdelvare@suse.de diff --git a/patch.spec b/patch.spec index 18b4a1c..62dd689 100644 --- a/patch.spec +++ b/patch.spec @@ -1,7 +1,7 @@ # # spec file for package patch # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,9 +20,9 @@ Name: patch Version: 2.7.6 Release: 0 Summary: GNU patch -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Text/Utilities -Url: http://ftp.gnu.org/gnu/patch/ +URL: http://ftp.gnu.org/gnu/patch/ Source: http://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=patch&download=1#/patch.keyring @@ -62,13 +62,13 @@ changed files (generated by the diff command) to the original files. %build export CFLAGS="%{optflags} -Wall -O2 -pipe" %configure -make %{?_smp_mflags} %{verbose:V=1}; +make %{?_smp_mflags} %check -make %{?_smp_mflags} check %{verbose:V=1} +make %{?_smp_mflags} check %install -make install DESTDIR=%{buildroot} %{verbose:V=1} +make install DESTDIR=%{buildroot} %files %doc AUTHORS NEWS README