SOURCES: rpm.macros * %install_kernel_modules: - unclosed %if shou...

[sparky]

Author: sparky                       Date: Sat Jan 27 19:25:55 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
* %install_kernel_modules:
- unclosed %if should be fixed now
- ident
- -nondist.ko suffix for without dist_kernel modules

---- Files affected:
SOURCES:
   rpm.macros (1.368 -> 1.369) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.368 SOURCES/rpm.macros:1.369
--- SOURCES/rpm.macros:1.368	Fri Jan 26 21:22:34 2007
+++ SOURCES/rpm.macros	Sat Jan 27 20:25:50 2007
@@ -1290,22 +1290,24 @@
 	[ -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}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.368&r2=1.369&f=u