From 1e9cb0e9707727bbc76edb6b2bdf2326ea540fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 8 Jul 2019 17:10:01 +0200 Subject: [PATCH] Revert "listfiles: fix expansion of listfiles_exclude/listfiles_include" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9deb0680eb7f4b757f12f5798afb3c1c49a4d7e1. Signed-off-by: Robert-André Mauchin --- macros.fedora-misc | 4 ++-- redhat-rpm-config.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros.fedora-misc b/macros.fedora-misc index 9ce85cf..a73b7c5 100644 --- a/macros.fedora-misc +++ b/macros.fedora-misc @@ -12,9 +12,9 @@ # Arguments passed to the macro without flags will be interpreted as inclusion # globs. %listfiles(i:x:) %{expand: -%if "%{?-i*}%{expand:%{?listfiles_include}}%*" != "" +%if "%{?-i*}%{expand:?listfiles_include}%*" != "" listfiles_include=$(realpath -e --relative-base=. %{?-i*} %{?listfiles_include} %* | sort -u) - %if "%{?-x*}%{expand:%{?listfiles_exclude}}" != "" + %if "%{?-x*}%{expand:?listfiles_exclude}" != "" while IFS= read -r finc ; do realpath -qe --relative-base=. %{?-x*} %{?listfiles_exclude} \\ | sort -u | grep -q "${finc}" || echo "${finc}" diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 30399fc..e95837d 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 135 +Version: 136 Release: 1%{?dist} # No version specified. License: GPL+ @@ -202,6 +202,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Jul 08 2019 Robert-André Mauchin - 136-1 +- Revert "Fix expansion in listfiles_exclude/listfiles_include" + * Mon Jul 08 2019 Nicolas Mailhot - 135-1 - Fix expansion in listfiles_exclude/listfiles_include