rpms/kernel/FC-3 kernel-2.6.spec,1.853,1.854

[fedora-cvs-commits redhat com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Drop the -devel changes that leaked in from the FC4 backport. (#163406)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- kernel-2.6.spec	28 Jul 2005 21:42:53 -0000	1.853
+++ kernel-2.6.spec	28 Jul 2005 23:08:46 -0000	1.854
@@ -357,18 +357,6 @@
 of the operating system:  memory allocation, process allocation, device
 input and output, etc.
 
-%package devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Prereq: /usr/sbin/hardlink, /usr/bin/find
-
-%description devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
-
 %package doc
 Summary: Various documentation bits found in the kernel source.
 Group: Documentation
@@ -408,19 +396,6 @@
 
 Install the kernel-smp package if your machine uses two or more CPUs.
 
-%package smp-devel
-Summary: Development package for building kernel modules to match the SMP kernel.
-Group: System Environment/Kernel
-Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
-Provides: kernel-devel = %{rpmversion}-%{release}smp
-AutoReqProv: no
-Prereq: /usr/sbin/hardlink, /usr/bin/find
-
-%description smp-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the SMP kernel package.
-
 %prep
 if [ ! -d kernel-%{kversion}/vanilla ]; then
 %setup -q -n %{name}-%{version} -c
@@ -772,12 +747,8 @@
     # Pick the right config file for the kernel we're building
     if [ -n "$1" ] ; then
 	Config=kernel-%{kversion}-%{_target_cpu}-$1.config
-	DevelDir=/usr/src/kernels/%{KVERREL}-$1-%{_target_cpu}
-	DevelLink=/usr/src/kernels/%{KVERREL}$1-%{_target_cpu}
     else
 	Config=kernel-%{kversion}-%{_target_cpu}.config
-	DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu}
-	DevelLink=
     fi
 
     KernelVer=%{version}-%{release}$1
@@ -897,12 +868,6 @@
     rm -f modinfo
     # remove files that will be auto generated by depmod at rpm -i time
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.*
-
-    # Move the devel headers out of the root file system
-    mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
-    mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
-    ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-    [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 }
 
 ###
@@ -963,25 +928,10 @@
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
 
-%post devel
-if [ -x /usr/sbin/hardlink ] ; then
-pushd /usr/src/kernels/%{KVERREL}-%{_target_cpu} > /dev/null
-/usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-popd > /dev/null
-fi
-
 %post smp
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
 
-%post smp-devel
-if [ -x /usr/sbin/hardlink ] ; then
-pushd /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu} > /dev/null
-/usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-popd > /dev/null
-fi
-
-
 %preun 
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
@@ -1002,12 +952,7 @@
 /boot/config-%{KVERREL}
 %dir /lib/modules/%{KVERREL}
 /lib/modules/%{KVERREL}/kernel
-/lib/modules/%{KVERREL}/build
-/lib/modules/%{KVERREL}/source
-
-%files devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu}
+%verify(not mtime) /lib/modules/%{KVERREL}/build
 %endif
 
 %if %{buildsmp}
@@ -1020,11 +965,7 @@
 /lib/modules/%{KVERREL}smp/kernel
 /lib/modules/%{KVERREL}smp/build
 /lib/modules/%{KVERREL}smp/source
-
-%files smp-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}smp-%{_target_cpu}
+%verify(not mtime) /lib/modules/%{KVERREL}smp/build
 %endif
 
 # only some architecture builds need kernel-doc
@@ -1041,6 +982,7 @@
 * Thu Jul 28 2005 Dave Jones <davej redhat com>
 - Fix compilation with older gcc. (#164041)
 - Bump mkinitrd minimum requirement.
+- Drop the -devel changes that leaked in from the FC4 backport. (#163406)
 
 * Fri Jul 15 2005 Dave Jones <davej redhat com>
 - Enable DC39x driver. (#151010)