rpms/kernel/FC-6 kernel-2.6.spec,1.2904,1.2905

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23286

Modified Files:
	kernel-2.6.spec 
Log Message:
Move xen sources out of kernel-xen-devel. (Don Zickus)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2904
retrieving revision 1.2905
diff -u -r1.2904 -r1.2905
--- kernel-2.6.spec	4 Feb 2007 18:15:00 -0000	1.2904
+++ kernel-2.6.spec	4 Feb 2007 18:16:40 -0000	1.2905
@@ -1377,12 +1377,6 @@
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
-  # need to let BuildKernel() create directory first.  The problem here is BuildKernel
-  # doesn't mkdir a new directory, but instead 'mv /lib/modules/<kern>/build to <new dir>
-  # if the <new dir> were to exist already, then the contents of 'build' are placed in a sub-dir
-  # named 'build' under <new dir>.  ugh.  So save xen directory temporarily instead
-  mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
-  mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp
 %endif
 %endif
 
@@ -1410,8 +1404,6 @@
 %if %{includexen}
 %if %{buildxen}
 BuildKernel %xen_target %xen_image xen
-# Now the directory is properly created, copy xen over
-mv $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/xen
 %endif
 %endif
 
@@ -1441,6 +1433,11 @@
 %files debuginfo-common
 %defattr(-,root,root)
 /usr/src/debug/%{name}-%{version}/linux-%{kversion}.%{_target_cpu}
+%if %{includexen}
+%if %{buildxen}
+/usr/src/debug/%{name}-%{version}/xen
+%endif
+%endif
 %dir /usr/src/debug
 %dir /usr/lib/debug
 %dir /usr/lib/debug/%{image_install_path}
@@ -2026,6 +2023,7 @@
 %changelog
 * Sun Feb  4 2007 Dave Jones <davej at redhat.com>
 - 2.6.19.3rc1
+- Move xen sources out of kernel-xen-devel. (Don Zickus)
 
 * Sat Feb  3 2007 Dave Jones <davej at redhat.com>
 - Remove kdump config options from non-kdump configs.