packages: rpm-build-macros/rpm.macros - handle also relative symlinks

[glen]

Author: glen                         Date: Sat Jul 30 13:29:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- handle also relative symlinks

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.614 -> 1.615) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.614 packages/rpm-build-macros/rpm.macros:1.615
--- packages/rpm-build-macros/rpm.macros:1.614	Sat Jul 30 15:22:34 2011
+++ packages/rpm-build-macros/rpm.macros	Sat Jul 30 15:29:45 2011
@@ -511,9 +511,19 @@
 			find "$RPM_BUILD_ROOT$i" -name '*.gz' -print | xargs -r %{__gzip} -dnf; \
 			find $RPM_BUILD_ROOT$i -type l | while read a; do \
 				m=$(readlink "$a"); \
+				if [[ "$m" = */* ]]; then \
+					# handle links to different man section \
+					l=$(readlink -f "$a"); \
+					# full/relative paths that resolve symlink \
+					l=${l#$RPM_BUILD_ROOT/usr/share/man/}; \
+					l=${l#$RPM_BUILD_ROOT/usr/X11R6/man/}; \
+					# full paths that do not resolve symlink \
+					l=${l#/usr/share/man/}; \
+					l=${l#/usr/X11R6/man/}; \
+				else \
+					l=$m; \
+				fi; \
 				rm -f $a; \
-				l=${m#/usr/share/man/}; \
-				l=${l#/usr/X11R6/man/}; \
 				echo ".so $l" > $a; \
 				echo >&2 "Converted ${a#$RPM_BUILD_ROOT} from symlink to man link: $l"; \
 			done; \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.614&r2=1.615&f=u