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

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 244b1295bdc65737f61b937ec0b1a88cd65ec442..6868b54b7fbbfb94f8de978e7186cea4ef7bcc60 100644 (file)
--- 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 1191109a0abc1091ce7269bb14867fe6d82b82d5..8456c980ecf25df4cb6a657de10a498f8e36268c 100644 (file)
--- 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"; \