Witam,
kernel.spec z HEAD (2.4.24) nie dostarcza Provides kernel-headers(grsecurity)
wymaganego przez gradm.spec . Ponieważ nie wiem do końca co jest co i jak to
powinno to wyglądać (ale chyba, nie tak, jak jest teraz), to załączam diffy.
( http://test.mmt.pl/screenshots/ - to, jakby wcięło załączniki)
--
Tomasz Wittner
2. Always build before committing
--------------------------------
You may be sure you've just corrected some small error and it will
not influence the build process... but try it.
Index: gradm.spec
===================================================================
RCS file: /cvsroot/SPECS/gradm.spec,v
retrieving revision 1.18
diff -u -r1.18 gradm.spec
--- gradm.spec 2 Dec 2003 18:59:33 -0000 1.18
+++ gradm.spec 8 Jan 2004 07:03:54 -0000
@@ -1,14 +1,19 @@
# $Revision: 1.18 $, $Date: 2003/12/02 18:59:33 $
-%define grsec_version 2.0-rc3
+# Conditional build:
+%bcond_without dist_kernel # allows build and install
+ # without distribution kernel
+%define _rc rc4
+%define grsec_version %{version}-%{_rc}
Summary: GrSecurity ACL Administration
Summary(pl): Administracja ACL GrSecurity
Name: gradm
Version: 2.0
-Release: 1
+Release: 0.%{_rc}.1
+Epoch: 1
License: GPL
Group: Applications/System
Source0: http://www.grsecurity.net/%{name}-%{grsec_version}.tar.gz
-# Source0-md5: 9758bd7407b034bf464c72c9aef27bad
+# Source0-md5: 76d9ac854733802ca9418093b4d57adb
Source1: http://www.grsecurity.net/gracldoc.htm
# Source1-md5: 010802958eaed78e4c370f4f5ce142b5
URL: http://www.grsecurity.net/
@@ -16,8 +21,8 @@
BuildRequires: flex
BuildRequires: glibc-static
BuildRequires: texinfo
-%{!?_without_dist_kernel:BuildRequires: kernel-headers(grsecurity) = %{grsec_version}}
-%{!?_without_dist_kernel:Requires: kernel(grsecurity) > 1.9.8}
+%{?with_dist_kernel:BuildRequires: kernel-headers(grsecurity) = %{grsec_version}}
+%{?with_dist_kernel:Requires: kernel(grsecurity) = %{grsec_version}}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
Index: kernel.spec
===================================================================
RCS file: /cvsroot/SPECS/kernel.spec,v
retrieving revision 1.571
diff -u -r1.571 kernel.spec
--- kernel.spec 5 Jan 2004 20:57:39 -0000 1.571
+++ kernel.spec 8 Jan 2004 07:15:31 -0000
@@ -272,7 +272,8 @@
# ftp://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.4.24/acpi-20031203-2.4.24.diff.bz2
Patch3510: acpi-20031203-2.4.24.diff.bz2
Patch3600: linux-2.4-sysctl-empty.patch
-Patch4000: grsecurity-2.0-rc4-2.4.24-O1.patch
+%define grsec_version 2.0-rc4
+Patch4000: grsecurity-%{grsec_version}-2.4.24-O1.patch
ExclusiveOS: Linux
URL: http://www.kernel.org/
@@ -293,6 +294,7 @@
Provides: %{name}(netfilter) = 1.2.9-%{netfilter_snap}
Provides: %{name}(reiserfs) = %{version}
Provides: %{name}(agpgart) = %{version}
+%{?with_grsec: Provides: kernel(gresecurity) = %{grsec_version}}
#Provides: %{name}(cdrw)
#Provides: %{name}(cdmrw)
AutoReqProv: no
@@ -518,6 +520,7 @@
Provides: %{name}-headers(bridging) = %{version}
Provides: kernel-i2c-devel = %{i2c_version}
Provides: %{name}-headers(netfilter) = 1.2.9-%{netfilter_snap}
+%{?with_grsec:Provides: %{name}-headers(grsecurity) = %{grsec_version}}
Obsoletes: kernel-i2c-devel
AutoReqProv: no
__________________________________________________________
nie pytaj co inni zrobili dla pld, pomysl ile sam zrobiles
