X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=2cdaf1d18846501930e72fd26f5a4b781a7c4600;hb=d8663f3d3d5c96809cfce3e518d368996341253e;hp=5da2ec9da12a3162c21274f18e7fe3f375241d69;hpb=a3896f0b8222349cadb4ca8eca1174eab9f6ca9e;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 5da2ec9..2cdaf1d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,8 +4,8 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %define		basever		6.1
-%define		postver		64
-%define		rel		0.1
+%define		postver		83
+%define		rel		1
 
 %define		alt_kernel	6.1
 
@@ -13,7 +13,7 @@
 # modules will be looked from /lib/modules/%{kernel_release}
 # localversion is just that without version for "> localversion"
 %define		localversion	%{rel}
-%define		kernel_release	%{version}%{?alt_kernel:-%{alt_kernel}}-%{localversion}
+%define		kernel_release	%{version}%{?alt_kernel:_%{alt_kernel}}-%{localversion}
 
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -30,7 +30,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
 # Source0-md5:	475320de08f16c9fa486fc4edfe98b30
 %if "%{postver}" != "0"
 Source1:	http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Source1-md5:	a69d10e6f44ad8bfc9badf97ba93c718
+# Source1-md5:	7dfd57b75a1d01e25919767dacfd8251
 %endif
 
 Source2:	kernel-module-build.pl
@@ -69,7 +69,6 @@ Suggests:	keyutils
 Suggests:	linux-firmware
 Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
-Obsoletes:	kernel%{_alt_kernel}-vanilla
 Obsoletes:	kernel-firmware
 Obsoletes:	kernel-modules
 Conflicts:	e2fsprogs < 1.29
@@ -157,7 +156,6 @@ 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%{_alt_kernel}-vanilla-vmlinux
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -176,7 +174,6 @@ Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	kernel-smp-drm
-Obsoletes:	kernel%{_alt_kernel}-vanilla-drm
 AutoReqProv:	no
 
 %description drm
@@ -196,7 +193,6 @@ Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	kernel-smp-pcmcia
-Obsoletes:	kernel%{_alt_kernel}-vanilla-pcmcia
 Conflicts:	pcmcia-cs < 3.1.21
 Conflicts:	pcmciautils < 004
 AutoReqProv:	no
@@ -218,7 +214,6 @@ Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	kernel-smp-sound-alsa
-Obsoletes:	kernel%{_alt_kernel}-vanilla-sound-alsa
 AutoReqProv:	no
 
 %description sound-alsa
@@ -236,7 +231,6 @@ Summary(de.UTF-8):	Header Dateien für den Linux-Kernel
 Summary(pl.UTF-8):	Pliki nagłówkowe jądra Linuksa
 Group:		Development/Building
 Provides:	%{name}-headers(netfilter) = 20070806
-Obsoletes:	kernel%{_alt_kernel}-vanilla-headers
 AutoReqProv:	no
 
 %description headers
@@ -259,7 +253,6 @@ Summary(de.UTF-8):	Development Dateien die beim Kernel Modul kompilationen gebra
 Summary(pl.UTF-8):	Pliki służące do budowania modułów jądra
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel%{_alt_kernel}-vanilla-module-build
 Conflicts:	rpmbuild(macros) < 1.652
 AutoReqProv:	no
 
@@ -281,7 +274,6 @@ Summary(de.UTF-8):	Der Kernel Quelltext
 Summary(pl.UTF-8):	Kod źródłowy jądra Linuksa
 Group:		Development/Building
 Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel%{_alt_kernel}-vanilla-source
 AutoReqProv:	no
 
 %description source
@@ -312,7 +304,6 @@ Summary:	Kernel documentation
 Summary(de.UTF-8):	Kernel Dokumentation
 Summary(pl.UTF-8):	Dokumentacja do jądra Linuksa
 Group:		Documentation
-Obsoletes:	kernel%{_alt_kernel}-vanilla-doc
 AutoReqProv:	no
 
 %description doc
@@ -748,6 +739,7 @@ fi
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/powerpc/kexec
 %{_kernelsrcdir}/arch/powerpc/kvm
+%{_kernelsrcdir}/arch/riscv/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
@@ -759,6 +751,7 @@ fi
 %{_kernelsrcdir}/drivers
 %{_kernelsrcdir}/fs
 %{_kernelsrcdir}/init
+%{_kernelsrcdir}/io_uring
 %{_kernelsrcdir}/ipc
 %{_kernelsrcdir}/kernel
 %exclude %{_kernelsrcdir}/kernel/bounds.c
@@ -766,6 +759,7 @@ fi
 %{_kernelsrcdir}/mm
 %{_kernelsrcdir}/net
 %{_kernelsrcdir}/virt
+%{_kernelsrcdir}/rust
 %{_kernelsrcdir}/samples
 %{_kernelsrcdir}/scripts/*
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include