[packages/rpm-build-macros] - 1.723; fix compressing man pages with spaces inside filenames

arekm arekm at pld-linux.org
Sun Jan 1 12:18:15 CET 2017


commit f1e00d6487af49f61c3e42cab742b18c4b5043df
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Jan 1 12:18:08 2017 +0100

    - 1.723; fix compressing man pages with spaces inside filenames

 rpm-build-macros.spec |  2 +-
 rpm.macros            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 765d69b..079bec1 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.722
+%define		rpm_macros_rev	1.723
 %define		find_lang_rev	1.38
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 1c2a813..1efd2fd 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -512,8 +512,8 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 	for i in /usr/share/man /usr/X11R6/man; do \
 		if [ -d "$RPM_BUILD_ROOT$i" ]; then \
 			echo "Compress man pages: $i"; \
-			find "$RPM_BUILD_ROOT$i" -name '*.bz2' -print | xargs -r %{__bzip2} -df; \
-			find "$RPM_BUILD_ROOT$i" -name '*.gz' -print | xargs -r %{__gzip} -dnf; \
+			find "$RPM_BUILD_ROOT$i" -name '*.bz2' -print0 | xargs -0 -r %{__bzip2} -df; \
+			find "$RPM_BUILD_ROOT$i" -name '*.gz' -print0 | xargs -0 -r %{__gzip} -dnf; \
 			find $RPM_BUILD_ROOT$i -type l | while read a; do \
 				m=$(readlink "$a"); \
 				if [[ "$m" = */* ]]; then \
@@ -543,14 +543,14 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 				test -e $RPM_BUILD_ROOT$i/$l || test -e $d/$(basename $l) || echo "  ${doc#$RPM_BUILD_ROOT} points to inexistent manpage: $l"; \
 			done); \
 			test "$err" != "" && { echo >&2 "Man page link errors:"; echo >&2 "$err"; exit 1; }; \
-			find "$RPM_BUILD_ROOT$i" -type f -size +%{_min_compress_bytes}c -print | xargs -r %{__gzip} -9nf; \
+			find "$RPM_BUILD_ROOT$i" -type f -size +%{_min_compress_bytes}c -print0 | xargs -0 -r %{__gzip} -9nf; \
 		fi; \
 	done; \
 	if [ -d "$RPM_BUILD_ROOT%{_infodir}" ]; then \
 		echo "Compress info pages: %{_infodir}"; \
-		find "$RPM_BUILD_ROOT%{_infodir}" -name '*.bz2' -print | xargs -r %{__bzip2} -df; \
-		find "$RPM_BUILD_ROOT%{_infodir}" -name '*.gz' -print | xargs -r %{__gzip} -dnf; \
-		find "$RPM_BUILD_ROOT%{_infodir}" -name '*.info*' -type f -size +%{_min_compress_bytes}c -print | xargs -r %{__gzip} -9nf; \
+		find "$RPM_BUILD_ROOT%{_infodir}" -name '*.bz2' -print0 | xargs -0 -r %{__bzip2} -df; \
+		find "$RPM_BUILD_ROOT%{_infodir}" -name '*.gz' -print0 | xargs -0 -r %{__gzip} -dnf; \
+		find "$RPM_BUILD_ROOT%{_infodir}" -name '*.info*' -type f -size +%{_min_compress_bytes}c -print0 | xargs -0 -r %{__gzip} -9nf; \
 	fi; \
 }; __spec_install_post_compress_docs } }
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/f1e00d6487af49f61c3e42cab742b18c4b5043df



More information about the pld-cvs-commit mailing list