rpms/gnbd-kernel/devel gnbd-kernel.spec,1.138,1.139

[fedora-cvs-commits at redhat.com]

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1965

Modified Files:
	gnbd-kernel.spec 
Log Message:
Reverted back to xenU.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gnbd-kernel.spec	6 Mar 2006 21:39:06 -0000	1.138
+++ gnbd-kernel.spec	6 Mar 2006 22:15:04 -0000	1.139
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.10
+Release: 5.FC5.11
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -33,8 +33,8 @@
 BuildRequires: kernel-smp = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}
 BuildRequires: kernel-smp-devel = %{kernel_version}
-BuildRequires: kernel-xen-guest = %{kernel_version}
-BuildRequires: kernel-xen-hypervisor = %{kernel_version}
+BuildRequires: kernel-xenU-devel = %{kernel_version}
+BuildRequires: kernel-xen0-devel = %{kernel_version}
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: kernel = %{kernel_version}
@@ -70,27 +70,27 @@
 %endif
 
 %if %{buildxen}
-%package -n gnbd-kernel-xen-guest
+%package -n gnbd-kernel-xenU
 Group: System Environment/Kernel
-Summary: gnbd-kernel-xen-guest - The kernel module for GFS's Network Block Device
-Requires: kernel-xen-guest = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}guest
+Summary: gnbd-kernel-xenU - The kernel module for GFS's Network Block Device
+Requires: kernel-xenU = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}xenU
 Provides: gnbd-kernel-modules = %{version}-%{release}
 Provides: kernel-modules
 
-%description -n gnbd-kernel-xen-guest
-gnbd-kernel-xen-guest - The xen-guest kernel module for GFS's Network Block Device
+%description -n gnbd-kernel-xenU
+gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device
 
-%package -n gnbd-kernel-xen-hypervisor
+%package -n gnbd-kernel-xen0
 Group: System Environment/Kernel
-Summary: gnbd-kernel-xen-hypservisor - The kernel module for GFS's Network Block Device
-Requires: kernel-xen-hypservisor = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}hypervisor
+Summary: gnbd-kernel-xen0 - The kernel module for GFS's Network Block Device
+Requires: kernel-xen0 = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}xen0
 Provides: kernel-modules
 Provides: gnbd-kernel-modules = %{version}-%{release}
 
-%description -n gnbd-kernel-xen-hypervisor
-gnbd-kernel-xen-hypervisor - The xen-hypervisor kernel module for GFS's Network Block Device
+%description -n gnbd-kernel-xen0
+gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device
 
 %endif
 ################################################################################
@@ -106,8 +106,8 @@
 BUILD_TOPDIR=`pwd`
 
 cp -r `pwd` ../smp
-cp -r `pwd` ../guest
-cp -r `pwd` ../hypervisor
+cp -r `pwd` ../xenU
+cp -r `pwd` ../xen0
 
 Build_gnbd(){
 	cpu_type=$1
@@ -124,7 +124,7 @@
 		exit 1
 	fi
         ./configure --kernel_src=$kernel_src --incdir=%{_includedir}
-        if [ "$flavor" == "xen-guest" -o "$flavor" == "xen-hypervisor" ]; then
+        if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then
                 make ARCH=xen %{?_smp_mflags}
         else
                 make %{?_smp_mflags}
@@ -141,11 +141,11 @@
 %endif
 
 %if %{buildxen}
-cd ../guest
-Build_gnbd %{_target_cpu} guest
+cd ../xenU
+Build_gnbd %{_target_cpu} xenU
 
-cd ../hypervisor
-Build_gnbd %{_target_cpu} hypervisor
+cd ../xen0
+Build_gnbd %{_target_cpu} xen0
 %endif
 
 ################################################################################
@@ -164,9 +164,9 @@
 %endif
 
 %if %{buildxen}
-cd ../guest
+cd ../xenU
 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
-cd ../hypervisor
+cd ../xen0
 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
 %endif
 
@@ -186,10 +186,10 @@
 %endif
 
 %if %{buildxen}
-%post xen-guest
-/sbin/depmod -e %{kernel_version}guest
-%post xen-hypervisor
-/sbin/depmod -a %{kernel_version}hypervisor
+%post xenU
+/sbin/depmod -e %{kernel_version}xenU
+%post xen0
+/sbin/depmod -a %{kernel_version}xen0
 %endif
 
 %files
@@ -203,13 +203,13 @@
 %endif
 
 %if %{buildxen}
-%files -n gnbd-kernel-xen-guest
+%files -n gnbd-kernel-xenU
 %defattr(-,root,root,-)
-/lib/modules/%{kernel_version}guest/kernel/drivers/block/gnbd/gnbd.ko
+/lib/modules/%{kernel_version}xenU/kernel/drivers/block/gnbd/gnbd.ko
 
-%files -n gnbd-kernel-xen-hypervisor
+%files -n gnbd-kernel-xen0
 %defattr(-,root,root,-)
-/lib/modules/%{kernel_version}hypervisor/kernel/drivers/block/gnbd/gnbd.ko
+/lib/modules/%{kernel_version}xen0/kernel/drivers/block/gnbd/gnbd.ko
 %endif
 
 %files -n gnbd-kernheaders