]> git.pld-linux.org Git - packages/rpm-build-macros.git/commitdiff
- handle also relative symlinks
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 30 Jul 2011 13:29:45 +0000 (13:29 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rpm.macros -> 1.615

rpm.macros

index 2312b8baf4efc522afcfc83e2e862168c0eb2acf..944122767d25df71e5e711ca30b04d18bcb267a0 100644 (file)
@@ -511,9 +511,19 @@ CXXFLAGS="%{rpmcxxflags}" \
                        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; \
This page took 0.038025 seconds and 4 git commands to generate.