- update to 0.20 (cvs rel 1.521)

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 6611ac9ed2aa8b46852ecb97b518d328110c3004..5bafd7603290271a12b1f63624d055165a337b35 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -347,6 +347,12 @@ unset DISPLAY ||:\
                        echo "Compress man pages: $i"; \
                        find "$RPM_BUILD_ROOT$i" -name '*.bz2' -print | xargs -r %{__bzip2} -df; \
                        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); \
+                               rm -f $a; \
+                               echo .so ${m##*/} > $a; \
+                               echo >&2 "Converted ${a#$RPM_BUILD_ROOT} from symlink to man link: ${m##*/}"; \
+                       done; \
                        find "$RPM_BUILD_ROOT$i" -type f -size +%{_min_compress_bytes}c -print | xargs -r %{__gzip} -9nf; \
                fi; \
        done; \
@@ -1167,8 +1173,9 @@ done \
 compile() {                                                                                                                    \
        L="<"; [[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)"    \
        set -e -x                                                                                                               \
+       local cfgs='%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}'     \
                                                                                                                                        \
-for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \
+for cfg in $cfgs; do                                                                                           \
        [ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1                                 \
                                                                                                                                        \
        rm -rf o                                                                                                                \
@@ -1178,8 +1185,8 @@ for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h \
 %ifarch ppc ppc64                                                                                                      \
        install -d o/include/asm                                                                                \
-       [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
-       [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm   \
+       [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
+       [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \
 %else                                                                                                                          \
        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm \
 %endif                                                                                                                         \
@@ -1229,7 +1236,7 @@ compile %{*}\
 #  -s <suffix> -- suffix to use when installing modules, useful when module
 #              with same name exists in kernel already
 #  -n <file> -- name of modprobe config file to use (without .conf extension)
-#              for definig aliases, only useful with -s
+#              for defining aliases, only useful with -s
 
 %install_kernel_modules(m:d:s:n:)                                                                      \
 %{!?-m:%{error:%{0}: Required module name (-m) missing}exit 1}         \