[packages/rpm-build-macros] - use just filename when checking man links in same directory

hawk hawk at pld-linux.org
Sun Aug 4 16:33:34 CEST 2013


commit 0f7dd079ee3014ca6e63e316436b579a613748aa
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sun Aug 4 14:48:26 2013 +0000

    - use just filename when checking man links in same directory

 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 6868b54..87e62ff 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:	5
+Release:	6
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
diff --git a/rpm.macros b/rpm.macros
index 8456c98..b27b119 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -549,7 +549,7 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 				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"; \
+				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; \
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list