diff --git a/kernel.spec b/kernel.spec index aff7e58..b49cabf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -21,7 +21,7 @@ # Don't parametrize this, it's a check to avoid build a kernel without having # edited the obsoletes needed for multiple kernel support -%define KERNEL_OBSOLETES_ARE_FOR_VERSION 3.14.24 +%define KERNEL_OBSOLETES_ARE_FOR_VERSION 3.14.25 #% define kernel_longterm 1 %define kernel_majver %(echo %version | cut -d. -f1-2) @@ -82,8 +82,8 @@ %define _use_internal_dependency_generator 1 Name: kernel -Version: 3.14.24 -Release: 2mamba +Version: 3.14.25 +Release: 1mamba Summary: The Linux Kernel, the operating system core itself Group: System/Kernel and Hardware Vendor: openmamba @@ -201,21 +201,6 @@ Requires(pre): bootloader Requires: kernelwireless-%{KERNEL_TARGET}-%{kernel_ver} Requires: kernelsound-%{KERNEL_TARGET}-%{kernel_ver} Requires: linux-firmware -%if "%{KERNEL_TARGET}" == "mamba" -Provides: kernel26-smppreempt == %{version} -Obsoletes: kernel26-smppreempt -Obsoletes: kernel26-smp -Obsoletes: kernel26-preempt -Obsoletes: kernel26-std -%endif -Provides: kernel-%{KERNEL_TARGET}-failsafe -Obsoletes: kernel-%{KERNEL_TARGET}-failsafe -Provides: kernel-%{KERNEL_TARGET}-extramodules -Obsoletes: kernel-%{KERNEL_TARGET}-extramodules -Provides: kernel-%{KERNEL_TARGET}-atl1e -Obsoletes: kernel-%{KERNEL_TARGET}-atl1e -Provides: kernel-%{KERNEL_TARGET}-drbd -Obsoletes: kernel-%{KERNEL_TARGET}-drbd Provides: kernel = %{version} ## KERNELOBSOLETES-BEGIN 3.14 Obsoletes: kernel-%{KERNEL_TARGET} < 3.10 @@ -227,14 +212,8 @@ Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.24 ## KERNELOBSOLETES-END -%ifarch %ix86 -Obsoletes: kernel-%{KERNEL_TARGET}-nongpl-nvidia_173xx -Obsoletes: kernel-%{KERNEL_TARGET}-nongpl-nvidia_71xx -Obsoletes: kernel-%{KERNEL_TARGET}-nongpl-nvidia_96xx -%endif -Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver} -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver} %description %{KERNEL_TARGET} The Linux Kernel, the operating system core itself. @@ -248,12 +227,6 @@ Summary: The source code for the Linux kernel Requires: kernel-%{KERNEL_TARGET}-headers == %{version}-%{release} Provides: kernelsource = %{version} Obsoletes: kernel-alsa-devel -%if "%{KERNEL_TARGET}" == "mamba" -Obsoletes: kernel26-smppreempt-source -Obsoletes: kernel26-smp-source -Obsoletes: kernel26-preempt-source -Obsoletes: kernel26-std-source -%endif ## KERNELOBSOLETES-BEGIN 3.14 Obsoletes: kernel-%{KERNEL_TARGET}-source < 3.10 Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.2 @@ -264,9 +237,8 @@ Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.24 ## KERNELOBSOLETES-END -Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-source -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-source %description %{KERNEL_TARGET}-source The kernel-source package contains the source code files for the Linux kernel. @@ -287,8 +259,8 @@ Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.24 ## KERNELOBSOLETES-END -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-headers %description %{KERNEL_TARGET}-headers The kernel-headers package contains the headers, scripts, configuration and Makefile to develop with the linux kernel @@ -309,9 +281,8 @@ Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.24 ## KERNELOBSOLETES-END -Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-headers-sanitised -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-headers-sanitised %description %{KERNEL_TARGET}-headers-sanitised Sanitised kernel headers used for glibc build. @@ -320,8 +291,9 @@ This kernel sanitised headers are configured for %{TARGET_CPU} architecture and %package %{KERNEL_TARGET}-sound Group: System/Kernel and Hardware Summary: The kernel sound subsystem +Provides: kernelsound = %{version} +Provides: kernelsound-%{KERNEL_TARGET}-%{kernel_ver} Requires: kernel-%{KERNEL_TARGET} == %{version}-%{release} -Provides: kernelsound-%{KERNEL_TARGET}-%{kernel_ver} = %{version} ## KERNELOBSOLETES-BEGIN 3.14 Obsoletes: kernel-%{KERNEL_TARGET}-sound < 3.10 Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.2 @@ -332,9 +304,8 @@ Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.24 ## KERNELOBSOLETES-END -Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-sound -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-sound %description %{KERNEL_TARGET}-sound The kernel-sound package contains the native kernel sound subsystem with ALSA drivers. @@ -343,8 +314,9 @@ This is packaged apart because more up-to-date drivers are provided by kernel-%{ %package %{KERNEL_TARGET}-wireless Group: System/Kernel and Hardware Summary: The kernel wireless subsystem +Provides: kernelwireless = %{version} +Provides: kernelwireless-%{KERNEL_TARGET}-%{kernel_ver} Requires: kernel-%{KERNEL_TARGET} == %{version}-%{release} -Provides: kernelwireless-%{KERNEL_TARGET}-%{kernel_ver} = %{version} Requires: iwlwifi-firmware ## KERNELOBSOLETES-BEGIN 3.14 Obsoletes: kernel-%{KERNEL_TARGET}-wireless < 3.10 @@ -356,9 +328,8 @@ Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.24 ## KERNELOBSOLETES-END -Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-wireless -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-wireless Requires: crda %description %{KERNEL_TARGET}-wireless @@ -368,6 +339,7 @@ This is packaged apart because more up-to-date drivers are provides by kernel-%{ %package %{KERNEL_TARGET}-firmware Group: System/Kernel and Hardware Summary: Firmware files used by the Linux Kernel +Provides: kernelfirmware = %{version} Requires: kernel-%{KERNEL_TARGET} == %{version}-%{release} ## KERNELOBSOLETES-BEGIN 3.14 Obsoletes: kernel-%{KERNEL_TARGET}-firmware < 3.10 @@ -379,10 +351,8 @@ Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.10 Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.11 Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.19 Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.23 +Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.24 ## KERNELOBSOLETES-END -Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-firmware -Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-firmware -Provides: kernelfirmware = %{version} Provides: linux_firmware %description %{KERNEL_TARGET}-firmware @@ -403,7 +373,7 @@ Firmware files used by the Linux Kernel. %endif %setup -q -c -n %{name}-%{kernel_ver}%{?KERNEL_TARGET} -# -D -T +#-D -T #:<< ___EOF %if "%{?kernel_longterm}" == "" mv linux-%{kernel_ver}/* . @@ -1069,6 +1039,9 @@ exit 0 /lib/firmware/* %changelog +* Sat Nov 22 2014 Silvan Calarco 3.14.25-1mamba +- update to 3.14.25 + * Thu Nov 20 2014 Silvan Calarco 3.14.24-2mamba - restore SUBLEVEL in version to work better with dkms, but prepare to some bugfixing elsewhere