From e5637efc257221bd6561e3f7a992f4a22dd5d675 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 4 Aug 2013 11:03:28 +0000 Subject: [PATCH] - don't use entire file contents as filename when checking if .so links point to existing files (was breaking checks when file had more content) --- rpm-build-macros.spec | 2 +- rpm.macros | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 244b129..6868b54 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -11,7 +11,7 @@ Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD Name: rpm-build-macros Version: %{rpm_macros_rev} -Release: 4 +Release: 5 License: GPL Group: Development/Building Source0: rpm.macros diff --git a/rpm.macros b/rpm.macros index 1191109..8456c98 100644 --- a/rpm.macros +++ b/rpm.macros @@ -546,7 +546,7 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release} # verify that .so links point to existing files (not allowed to point to "other package") \ # TODO: iterate over all man dirs, but in Th there is only one true man dir \ err=$(grep -rl '^\.so ' "$RPM_BUILD_ROOT$i" | while read doc; do \ - l=$(cat "$doc"); \ + l=$(grep -r '^\.so ' "$doc"); \ l=${l#.so }; \ d=$(dirname $doc); \ test -e $RPM_BUILD_ROOT$i/$l || test -e $d/$l || echo " ${doc#$RPM_BUILD_ROOT} points to inexistent manpage: $l"; \ -- 2.44.0