- 5.10.36

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index e3bdac08eb4c965a712a064e8612859550689987..d696902f37341f1c3b4b6b9d7c1656bf384e9611 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,10 +73,10 @@
 
 %define                rel             1
 %define                basever         5.10
-%define                postver         .16
+%define                postver         .36
 
 # define this to '-%{basever}' for longterm branch
-%define                versuffix       %{nil}
+%define                versuffix       -%{basever}
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -127,7 +127,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  6eb3cfa9872f7c0cbc59e5c17eca854c
+# Patch0-md5:  0d1448a7e28ee08ea5a0531de50e02f5
 %endif
 Source1:       kernel.sysconfig
 
@@ -201,7 +201,7 @@ Patch101:   kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.8 origin/aufs5.8
+# git checkout -b aufs5.10 origin/aufs5.10
 # cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ~/rpm/packages/kernel/kernel-aufs5.patch
 # rm -rf linux && mkdir linux; cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs5.patch
@@ -279,23 +279,23 @@ Suggests: keyutils
 Requires:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-ene0100
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-it87
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-ite8709
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-mceusb
-Obsoletes:     kernel%{_alt_kernel}-char-lirc-streamzap
-Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
-Obsoletes:     kernel-firmware
-Obsoletes:     kernel-misc-acer_acpi
-Obsoletes:     kernel-misc-fuse
-Obsoletes:     kernel-misc-uvc
-Obsoletes:     kernel-modules
-Obsoletes:     kernel-net-ar81
-Obsoletes:     kernel-net-hostap
-Obsoletes:     kernel-net-ieee80211
-Obsoletes:     kernel-net-ipp2p
-Obsoletes:     kernel-net-rt61
-Obsoletes:     kernel-smp
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-ene0100 < 0.9.0
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-it87 < 0.9.0
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-ite8709 < 0.9.0
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-mceusb < 0.9.0
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-streamzap < 0.9.0
+Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN < 2.0.35
+Obsoletes:     kernel-firmware < 3:2.6.33
+Obsoletes:     kernel-misc-acer_acpi < 0.3-2
+Obsoletes:     kernel-misc-fuse < 2.8.5-2
+Obsoletes:     kernel-misc-uvc < 0.215.1-10
+Obsoletes:     kernel-modules < 2.2.2-2
+Obsoletes:     kernel-net-ar81 < 1.0.1.0-3
+Obsoletes:     kernel-net-hostap < 0.4.7-2
+Obsoletes:     kernel-net-ieee80211 < 1.2.18-7
+Obsoletes:     kernel-net-ipp2p < 0.8.2.-17
+Obsoletes:     kernel-net-rt61 < 1.1.0-2.2007122707.13
+Obsoletes:     kernel-smp < 3:2.6.21
 Conflicts:     e2fsprogs < 1.29
 Conflicts:     isdn4k-utils < 3.1pre1
 Conflicts:     jfsutils < 1.1.3
@@ -443,7 +443,7 @@ Summary:    vmlinux - uncompressed kernel image
 Summary(de.UTF-8):     vmlinux - dekompressiertes Kernel Bild
 Summary(pl.UTF-8):     vmlinux - rozpakowany obraz jądra
 Group:         Base/Kernel
-Obsoletes:     kernel-smp-vmlinux
+Obsoletes:     kernel-smp-vmlinux < 3:2.6.21
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -462,7 +462,7 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      kernel(vboxvideo) = %{kernel_release}
-Obsoletes:     kernel-smp-drm
+Obsoletes:     kernel-smp-drm < 3:2.6.21
 AutoReqProv:   no
 
 %description drm
@@ -499,7 +499,7 @@ Summary(pl.UTF-8):  Moduły PCMCIA
 Group:         Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     kernel-smp-pcmcia
+Obsoletes:     kernel-smp-pcmcia < 3:2.6.21
 Conflicts:     pcmcia-cs < 3.1.21
 Conflicts:     pcmciautils < 004
 AutoReqProv:   no
@@ -520,7 +520,7 @@ Summary(pl.UTF-8):  Sterowniki dźwięku ALSA
 Group:         Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     kernel-smp-sound-alsa
+Obsoletes:     kernel-smp-sound-alsa < 3:2.6.21
 AutoReqProv:   no
 
 %description sound-alsa
@@ -584,7 +584,7 @@ Summary(pl.UTF-8):  Kod źródłowy jądra Linuksa
 Group:         Development/Building
 Requires:      %{name}-module-build = %{epoch}:%{version}-%{release}
 AutoReqProv:   no
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description source
 This is the source code for the Linux kernel. You can build a custom
@@ -615,7 +615,7 @@ Summary(de.UTF-8):  Kernel Dokumentation
 Summary(pl.UTF-8):     Dokumentacja do jądra Linuksa
 Group:         Documentation
 AutoReqProv:   no
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description doc
 This is the documentation for the Linux kernel, as found in