ppcrcd/trunk/patches/kernel.spec.patch
sparky
cvs at pld-linux.org
Mon Jun 12 18:16:37 CEST 2006
Author: sparky
Date: Mon Jun 12 18:16:36 2006
New Revision: 7478
Modified:
ppcrcd/trunk/patches/kernel.spec.patch
Log:
- kernel.spec: Provides: uname(release) = %{version}
Modified: ppcrcd/trunk/patches/kernel.spec.patch
==============================================================================
--- ppcrcd/trunk/patches/kernel.spec.patch (original)
+++ ppcrcd/trunk/patches/kernel.spec.patch Mon Jun 12 18:16:36 2006
@@ -1,11 +1,11 @@
Index: kernel.spec
===================================================================
RCS file: /cvsroot/SPECS/kernel.spec,v
-retrieving revision 1.441.2.1357
-diff -u -r1.441.2.1357 kernel.spec
---- kernel.spec 2 Jan 2006 11:47:11 -0000 1.441.2.1357
-+++ kernel.spec 4 Jan 2006 19:57:33 -0000
-@@ -102,9 +102,9 @@
+retrieving revision 1.441.2.1419.2.2
+diff -u -r1.441.2.1419.2.2 kernel.spec
+--- kernel.spec 7 May 2006 16:55:44 -0000 1.441.2.1419.2.2
++++ kernel.spec 12 Jun 2006 16:15:21 -0000
+@@ -100,9 +100,9 @@
%endif
%endif
@@ -19,16 +19,16 @@
%ifarch %{ix86} alpha ppc
%define have_isa 1
@@ -369,6 +369,9 @@
- Patch401: kernel-hotfixes.patch
Patch402: linux-em8300-2.6.11.2.patch
+ Patch403: kernel-2.6-pcmcia.patch
+#squashfs lzma compression
+Patch500: kernel-squashfs-lzma.patch
+
URL: http://www.kernel.org/
- BuildRequires: binutils >= 2.14.90.0.7
+ BuildRequires: binutils >= 3:2.14.90.0.7
BuildRequires: diffutils
-@@ -383,7 +386,6 @@
+@@ -382,7 +385,6 @@
BuildRequires: rpmbuild(macros) >= 1.217
Autoreqprov: no
Requires: coreutils
@@ -36,16 +36,24 @@
Requires: module-init-tools >= 0.9.9
Provides: %{name}-up = %{epoch}:%{version}-%{release}
Provides: kernel = %{epoch}:%{version}-%{release}
-@@ -910,6 +912,8 @@
- %patch402 -p1
- %endif
+@@ -396,6 +398,7 @@
+ Provides: kernel-net-ipw2100 = 1.1.3
+ Provides: kernel-net-ipw2200 = 1.0.8
+ Provides: module-info
++Provides: uname(release) = %{version}
+ Obsoletes: kernel-misc-fuse
+ Obsoletes: kernel-modules
+ Obsoletes: kernel-net-hostap
+@@ -952,6 +955,8 @@
+
+ #patch403 -p1
+%patch500 -p1
+
# Fix EXTRAVERSION in main Makefile
sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}#g' Makefile
-@@ -1323,6 +1327,7 @@
+@@ -1370,6 +1375,7 @@
fi
%post
@@ -53,7 +61,7 @@
%ifarch ia64
mv -f /boot/efi/vmlinuz /boot/efi/vmlinuz.old 2> /dev/null > /dev/null
%endif
-@@ -1509,6 +1509,7 @@
+@@ -1542,6 +1548,7 @@
%ifnarch sparc
/lib/modules/%{version}-%{release}/kernel/arch
%endif
More information about the pld-cvs-commit
mailing list