#62 Revert "listfiles: fix expansion of listfiles_exclude/listfiles_include"
Merged 2 months ago by ignatenkobrain. Opened 2 months ago by eclipseo.
rpms/ eclipseo/redhat-rpm-config master  into  master

file modified
+2 -2

@@ -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}"

file modified
+4 -1

@@ -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 @@ 

  %{_rpmconfigdir}/macros.d/macros.kmp

  

  %changelog

+ * Mon Jul 08 2019 Robert-André Mauchin <zebob.m@gmail.com> - 136-1

+ - Revert "Fix expansion in listfiles_exclude/listfiles_include"

+ 

  * Mon Jul 08 2019 Nicolas Mailhot <nim@fedoraproject.org> - 135-1

  - Fix expansion in listfiles_exclude/listfiles_include

  

This reverts commit 9deb068.

Signed-off-by: Robert-André Mauchin zebob.m@gmail.com

This change broke the expansion for multilines listfiles, which is why I added expands in the first place!

Pull-Request has been merged by ignatenkobrain

2 months ago