[packages/rpm-build-macros/fix_links] allow man links to point to the file in the same directory

draenog draenog at pld-linux.org
Tue Mar 26 16:34:51 CET 2013


commit b27f6a7a15c7bc17acc90dea41833ad28e612f97
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Tue Mar 26 15:32:57 2013 +0000

    allow man links to point to the file in the same directory

 rpm.macros | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/rpm.macros b/rpm.macros
index bc2f463..6602b97 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -538,8 +538,9 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 			err=$(grep -rl '^\.so ' "$RPM_BUILD_ROOT$i" | while read doc; do \
 				l=$(cat "$doc"); \
 				l=${l#.so }; \
+				d=$(dirname $doc); \
 				# TODO: iterate over all man dirs, but in Th there's only one true man dir \
-				test -e $RPM_BUILD_ROOT$i/$l || echo "  ${doc#$RPM_BUILD_ROOT} points to inexistent manpage: $l"; \
+				test -e $RPM_BUILD_ROOT$i/$l || test -e $d/$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; \
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list