rpms/kernel/devel kernel.spec,1.61,1.62

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20241

Modified Files:
	kernel.spec 
Log Message:
spec fixups for last change


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kernel.spec	9 Aug 2007 09:23:39 -0000	1.61
+++ kernel.spec	9 Aug 2007 10:14:12 -0000	1.62
@@ -206,6 +206,18 @@
 
 # These arches install vdso/ directories.
 %define vdso_arches %{all_x86} x86_64 ppc ppc64
+%ifarch %{all_x86}
+%define vdso_subdir kernel
+%endif
+%ifarch x86_64
+%define vdso_subdir vdso ia32
+%endif
+%ifarch ppc
+%define vdso_subdir kernel/vdso32
+%endif
+%ifarch ppc64
+%define vdso_subdir kernel/vdso64 kernel/vdso32
+%endif
 
 # Overrides for generic default options
 
@@ -1266,6 +1278,12 @@
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
+%ifarch %{vdso_arches}
+    for subdir in %{vdso_subdir}; do
+      make -s ARCH=$Arch -f scripts/Makefile.build obj=arch/$Arch/$subdir \
+      	   install INSTALL_MOD_PATH=$RPM_BUILD_ROOT KERNELRELEASE=$KernelVer
+    done
+%endif
 
     # And save the headers/makefiles etc for building modules against
     #
@@ -1678,11 +1696,11 @@
 %{expand:%%files -f debuginfo%{?2}.list %{?2:%{2}-}debuginfo}\
 %endif\
 %defattr(-,root,root)\
-%if %{fancy_debuginfo}\
+%if !%{fancy_debuginfo}\
 %if "%{elf_image_install_path}" != ""\
 %{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}%{?2}.debug\
 %endif\
-%{debuginfodir}/lib/modules/%{KVERREL}{%?2}\
+%{debuginfodir}/lib/modules/%{KVERREL}%{%?2}\
 %{debuginfodir}/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
 %endif\
 %endif\