PR#60: use working expansion syntax in listfiles - rpms/redhat-rpm-config

Nicolas Mailhot • 4 years ago

9deb068

macros.fedora-misc

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

redhat-rpm-config.spec

file modified

+5 -2

		`@@ -6,7 +6,7 @@`

		`Summary: Red Hat specific rpm configuration files`
		`Name: redhat-rpm-config`
		`- Version: 134`
		`+ Version: 135`
		`Release: 1%{?dist}`
		`# No version specified.`
		`License: GPL+`
		`@@ -202,6 +202,9 @@`
		`%{_rpmconfigdir}/macros.d/macros.kmp`

		`%changelog`
		`+ * Mon Jul 08 2019 Nicolas Mailhot <nim@fedoraproject.org> - 135-1`
		`+ - Fix expansion in listfiles_exclude/listfiles_include`
		`+`
		`* Mon Jul 01 2019 Florian Festi <ffesti@redhat.com> - 134-1`
		`- Switch binary payload compression to Zstandard level 19`

		`@@ -209,7 +212,7 @@`
		`- Enable RPM to set SOURCE_DATE_EPOCH environment variable.`

		`* Tue Jun 25 08:13:50 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 133-1`
		`- - Expand listfiles_exclude/listfiles/include`
		`+ - Expand listfiles_exclude/listfiles_include`

		`* Tue Jun 11 2019 Jitka Plesnikova <jplesnik@redhat.com> - 132-1`
		`- Remove perl macro refugees`