X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=99acf8cb0bcd629515c789a3b8378be6dde4364f;hb=d8b145b86f6f4b685b56ccaef7e9f5a6d4e21a9f;hp=e09e255ab322be3d952eb5e12fb24e924ab79cc7;hpb=59657b4e307af971d6f7188f72b408d0ba672752;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index e09e255ab..99acf8cb0 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,7 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 9
+%define taglevel 10
 
 %define sublevel 32
 #### Planet-Lab ####
@@ -1556,7 +1556,11 @@ fi\
 %if %{with_dracut}\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --dracut --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\
 %else\
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\
+%else\
+/sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}%{?1:.%{1}} || exit $?\
+%endif\
 %endif}\
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 12\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\
@@ -1778,6 +1782,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 25 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-10
+- disable debug and debuginfo packages for all flavors. Also incorporate kernel-firmware package's content into kernel RPM.
+
 * Wed Jan 12 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-9
 - bump to kernel-2.6.32-71.14.1.el6, see https://rhn.redhat.com/errata/RHSA-2011-0007.html for details