- find grsecurity kernels

Changed files:
    anaconda-kernel.patch -> 1.1
    anaconda.spec -> 1.33

diff --git a/anaconda-kernel.patch b/anaconda-kernel.patch
new file mode 100644 (file)
index 0000000..95968ee
--- /dev/null
+++ b/anaconda-kernel.patch
@@ -0,0 +1,31 @@
+--- anaconda-11.0.5/yuminstall.py~     2006-05-24 02:51:56.715042751 +0300
++++ anaconda-11.0.5/yuminstall.py      2006-05-24 03:01:04.177356166 +0300
+@@ -701,7 +701,7 @@
+ 
+         # FIXME: this is a bit of a hack.  we shouldn't hard-code and
+         # instead check by provides.  but alas.
+-        for k in ("kernel", "kernel-smp", "kernel-xen0"):
++        for k in ("kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0"):
+             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:            
+                 foundkernel = True
+ 
+@@ -736,8 +736,8 @@
+ 
+         if not foundkernel and (isys.smpAvailable() or isys.htavailable()):
+             try:
+-                ksmp = getBestKernelByArch("kernel-smp", self.ayum)
+-                log.info("selected kernel-smp package for kernel")
++                ksmp = getBestKernelByArch("kernel-grsecurity-smp", self.ayum)
++                log.info("selected kernel-grsecurity-smp package for kernel")
+                 foundkernel = True
+             except PackageSackError:
+                 ksmp = None
+@@ -1028,7 +1028,7 @@
+         kernelVersions = []
+ 
+         # nick is used to generate the lilo name
+-        for (ktag, nick) in [ ('kernel-smp', 'smp'),
++        for (ktag, nick) in [ ('kernel-grsecurity-smp', 'smp'),
+                               ('kernel-xen0', 'xen0'),
+                               ('kernel-xenU', 'xenU') ]:
+             tag = ktag.rsplit('-', 1)[1]

diff --git a/anaconda.spec b/anaconda.spec
index f766b8c6c52c6e87ccaba4b212d620e8e2a212fa..a112a3a13e5dc302eb852298af9b6f76f44a602a 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -14,7 +14,7 @@ Summary:      Graphical system installer
 Summary(pl):   Graficzny instalator systemu
 Name:          anaconda
 Version:       11.0.5
-Release:       0.26
+Release:       0.27
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@ Patch4:               %{name}-errorhandling.patch
 Patch5:                %{name}-libdir.patch
 Patch6:                %{name}-pld-release.patch
 Patch7:                %{name}-timezone.patch
+Patch8:                %{name}-kernel.patch
 URL:           http://fedora.redhat.com/projects/anaconda-installer/
 BuildRequires: X11-devel
 BuildRequires: beecrypt-devel
@@ -146,6 +147,7 @@ systemach.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po