Luiz Fernando N. Capitulino wrote:
> On Mon, 17 Apr 2006 15:44:42 +0300
> Anssi Hannula <[EMAIL PROTECTED]> wrote:
>
> | Luiz Fernando N. Capitulino wrote:
> | > Hi Anssi,
> | >
> | > On Fri, 14 Apr 2006 00:06:21 +0300
> | > Anssi Hannula <[EMAIL PROTECTED]> wrote:
> | >
> | > | Eduardo Pereira Habkost wrote:
> | > | > Hi,
> | > | >
> | > | > On Thu, Apr 13, 2006 at 11:42:49PM +0300, Anssi Hannula wrote:
> | > | > <snip>
> | > | >
> | > | >>
> | > | >>Attached is a patch that changes that to:
> | > | >>
> | > | >>src.rpm:
> | > | >>Name: name
> | > | >>Version: %realversion
> | > | >>Release: %realrelease
> | > | >>
> | > | >>All kernels and sources:
> | > | >>Name: name-%mdkversion
> | > | >>Version: %rpmversion
> | > | >>Release: %rpmrelease
> | > | >
> | > | >
> | > | > Thanks for the patch.
> | > | >
> | > | > I agree with the changes. But I will wait for the others to say what
> | > | > they think, before including them.
> | > | >
> | > | >>
> | > | >>IOW:
> | > | >>1. Source package name no longer changes between releases.
> | > | >>2. Fix some kernels and kernel-source pkgs to not have the real
> version
> | > | >>and release.
> | > | >
> | > | >
> | > | > Item 2 was already done in the SVN repository, so the patch doesn't
> | > | > apply cleanly. You may get the current in-development version of the
> | > | > cooker kernel spec from:
> | > | >
> | > | > https://cvs.mandriva.com/svn/mdv/cooker/kernel-2.6/current/
> | > | >
> | > | > By using the svn version as reference, we may avoid duplicating work
> | > | > and having to regenerate the changes.
> | > | >
> | > |
> | > | Okay, thanks for the info. It appears the kernel-source pkg versioning
> | > | is fixed in svn and those hunks #12 and #13 fail, but all the other
> | > | hunks in the patch do apply.
> | >
> | > Could you generate the patch again, against the current version?
> |
> | Actually, I cannot.
> |
> | https://cvs.mandriva.com/svn/mdv/cooker/kernel-2.6/ returns "No such
> | revision 26511"
>
> Strange, it works ok here.. But you can get the src.rpm from the
> repository also.
>
Apparently it works again now.
Diff is attached.
--
Anssi Hannula
--- kernel-2.6.spec.old 2006-04-17 17:51:22.000000000 +0300
+++ kernel-2.6.spec 2006-04-17 17:50:20.000000000 +0300
@@ -153,9 +153,9 @@
%define target_arch %(echo %{_arch} | sed -e "s/amd64/x86_64/")
Summary: The Linux kernel (the core of the Linux operating system).
-Name: %{kname}-%{mdkversion}
-Version: %{rpmversion}
-Release: %{rpmrelease}
+Name: %{kname}
+Version: %{realversion}
+Release: %{realrelease}
License: GPL
Group: System/Kernel and hardware
ExclusiveArch: %{ix86} alpha ppc powerpc ia64 x86_64 amd64 sparc sparc64
@@ -204,15 +204,28 @@
%define kprovides kernel = %{realversion}, alsa
BuildRoot: %{_tmppath}/%{name}-%{realversion}-build
-Provides: module-info, %kprovides
Autoreqprov: no
+BuildRequires: gcc module-init-tools >= 0.9.15
+
+%description
+Source package for the Linux kernel, the core of your Mandriva Linux
+operating system. The kernel handles the basic functions of the operating
+system: memory allocation, process allocation, device input and output, etc.
+
+%{devel_notice}
+
+%package -n %{kname}-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
+Summary: The Linux kernel (the core of the Linux operating system).
+Group: System/Kernel and hardware
+Provides: module-info, %kprovides
Requires: %requires1
Requires: %requires2
Requires: %requires3
Requires: %requires4
-BuildRequires: gcc module-init-tools >= 0.9.15
-%description
+%description -n %{kname}-%{mdkversion}
The kernel package contains the Linux kernel (vmlinuz), the core of your
Mandriva Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
@@ -228,6 +241,8 @@
#
%package -n %{kname}-smp-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled for SMP machines.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -247,6 +262,8 @@
%{devel_notice}
%package -n %{kname}-secure-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled for SECURE machines.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -274,6 +291,8 @@
#
%package -n %{kname}-enterprise-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled with options for Enterprise server usage.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -298,6 +317,8 @@
#
%package -n %{kname}-BOOT-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The version of the Linux kernel used on installation boot disks.
Group: System/Kernel and hardware
@@ -317,6 +338,8 @@
#
%package -n %{kname}-xbox-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The version of the Linux kernel used on XBox machines.
Group: System/Kernel and hardware
Url: http://peoples.mandrakesoft.com/~sbenedict/XBox/
@@ -337,6 +360,8 @@
%{devel_notice}
%package -n %{kname}-i586-up-1GB-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled for up with less than 1GB.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -355,6 +380,8 @@
%{devel_notice}
%package -n %{kname}-i686-up-4GB-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled for up with 4GB.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -374,6 +401,8 @@
%{devel_notice}
%package -n %{kname}-i686-up-1GB-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled for up with less than 1GB.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -393,6 +422,8 @@
%{devel_notice}
%package -n %{kname}-i686-smp-1GB-%{mdkversion}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The Linux Kernel compiled for up with less than 1GB.
Group: System/Kernel and hardware
Provides: %kprovides
@@ -462,8 +493,6 @@
#
%package -n %{kname}-doc
-Version: %{version}
-Release: %{release}
Summary: Various documentation bits found in the kernel source.
Group: Books/Computer books
@@ -484,8 +513,8 @@
#
%package -n %{kname}-xen0-%{mdkversion}
-Version: %{realversion}
-Release: %{realrelease}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The XEN hypervisor kernel
Group: Development/Kernel
Autoreqprov: no
@@ -497,8 +526,8 @@
%{devel_notice}
%package -n %{kname}-xenU-%{mdkversion}
-Version: %{realversion}
-Release: %{realrelease}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The XEN guests kernel
Group: Development/Kernel
Autoreqprov: no
@@ -514,8 +543,8 @@
#
%package -n %{kname}-power5-%{mdkversion}
-Version: %{realversion}
-Release: %{realrelease}
+Version: %{rpmversion}
+Release: %{rpmrelease}
Summary: The POWER5 optimized kernel
Group: Development/Kernel
Autoreqprov: no
@@ -1145,7 +1174,7 @@
###
%if %build_up
-%files -f kernel_files.%{KVERREL}
+%files -n %{kname}-%{mdkversion} -f kernel_files.%{KVERREL}
%endif
%if %build_xen
