* %install_kernel_modules:

- unclosed %if should be fixed now
- ident
- -nondist.ko suffix for without dist_kernel modules

Changed files:
    rpm.macros -> 1.369

diff --git a/rpm.macros b/rpm.macros
index c2297e6f459c8518767d1282bad0d38cb2a9237e..40f653a4933e01b3792a098e555c43b894921b3d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1290,22 +1290,24 @@ for MODULE in {%{-m*},}; do                                                                                     \
        [ -n "${MODULE}" ] || continue                                                                  \
        MNAME=${MODULE##*/}                                                                                             \
        %if %{without dist_kernel}                                                                              \
-               install %{MODULE}.ko                                                                            \\\
-               %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                                      \
+               install %{MODULE}-nondist.ko                                                            \\\
+                       %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                              \
                %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"                                     \\\
-               >> %{ModprobeD}/%{-n*}.conf}                                                            \
-       %endif                                                                                                                  \
-       %if %{with up} && %{with dist_kernel}                                                   \
+                       >> %{ModprobeD}/%{-n*}.conf}                                                    \
+       %else                                                                                                                   \
+       %if %{with up}                                                                                                  \
                install ${MODULE}-up.ko                                                                         \\\
-               %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                                      \
+                       %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                              \
                %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"                                     \\\
-               >> %{ModprobeD}/%{-n*}.conf}                                                            \
-    %if %{with smp} && %{with dist_kernel}                                                     \
+                       >> %{ModprobeD}/%{-n*}.conf}                                                    \
+       %endif                                                                                                                  \
+       %if %{with smp}                                                                                                 \
                install ${MODULE}-smp.ko                                                                        \\\
-               %{KernelD}smp/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                           \
+                       %{KernelD}smp/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                   \
                %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"                                     \\\
-               >> %{ModprobeD}smp/%{-n*}.conf}                                                         \
-    %endif                                                                                                                     \
+                       >> %{ModprobeD}smp/%{-n*}.conf}                                                 \
+       %endif                                                                                                                  \
+       %endif                                                                                                                  \
 done                                                                                                                           \
 %{nil}