File project.diff of Package kernel-source

--- dtb-aarch64.spec.orig
+++ dtb-aarch64.spec
@@ -195,6 +195,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-allwinner -f dtb-allwinner.list
 %else
+
 %files -n dtb-allwinner
 %endif
 %defattr(-,root,root)
@@ -222,6 +223,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-altera -f dtb-altera.list
 %else
+
 %files -n dtb-altera
 %endif
 %defattr(-,root,root)
@@ -250,6 +252,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-amazon -f dtb-amazon.list
 %else
+
 %files -n dtb-amazon
 %endif
 %defattr(-,root,root)
@@ -277,6 +280,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-amd -f dtb-amd.list
 %else
+
 %files -n dtb-amd
 %endif
 %defattr(-,root,root)
@@ -304,6 +308,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-amlogic -f dtb-amlogic.list
 %else
+
 %files -n dtb-amlogic
 %endif
 %defattr(-,root,root)
@@ -332,6 +337,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-apm -f dtb-apm.list
 %else
+
 %files -n dtb-apm
 %endif
 %defattr(-,root,root)
@@ -359,6 +365,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-apple -f dtb-apple.list
 %else
+
 %files -n dtb-apple
 %endif
 %defattr(-,root,root)
@@ -388,6 +395,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-arm -f dtb-arm.list
 %else
+
 %files -n dtb-arm
 %endif
 %defattr(-,root,root)
@@ -415,6 +423,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-broadcom -f dtb-broadcom.list
 %else
+
 %files -n dtb-broadcom
 %endif
 %defattr(-,root,root)
@@ -443,6 +452,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-cavium -f dtb-cavium.list
 %else
+
 %files -n dtb-cavium
 %endif
 %defattr(-,root,root)
@@ -470,6 +480,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-exynos -f dtb-exynos.list
 %else
+
 %files -n dtb-exynos
 %endif
 %defattr(-,root,root)
@@ -497,6 +508,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-freescale -f dtb-freescale.list
 %else
+
 %files -n dtb-freescale
 %endif
 %defattr(-,root,root)
@@ -525,6 +537,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-hisilicon -f dtb-hisilicon.list
 %else
+
 %files -n dtb-hisilicon
 %endif
 %defattr(-,root,root)
@@ -552,6 +565,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-lg -f dtb-lg.list
 %else
+
 %files -n dtb-lg
 %endif
 %defattr(-,root,root)
@@ -579,6 +593,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-marvell -f dtb-marvell.list
 %else
+
 %files -n dtb-marvell
 %endif
 %defattr(-,root,root)
@@ -606,6 +621,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-mediatek -f dtb-mediatek.list
 %else
+
 %files -n dtb-mediatek
 %endif
 %defattr(-,root,root)
@@ -633,6 +649,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-nvidia -f dtb-nvidia.list
 %else
+
 %files -n dtb-nvidia
 %endif
 %defattr(-,root,root)
@@ -660,6 +677,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-qcom -f dtb-qcom.list
 %else
+
 %files -n dtb-qcom
 %endif
 %defattr(-,root,root)
@@ -687,6 +705,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-renesas -f dtb-renesas.list
 %else
+
 %files -n dtb-renesas
 %endif
 %defattr(-,root,root)
@@ -714,6 +733,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-rockchip -f dtb-rockchip.list
 %else
+
 %files -n dtb-rockchip
 %endif
 %defattr(-,root,root)
@@ -741,6 +761,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-socionext -f dtb-socionext.list
 %else
+
 %files -n dtb-socionext
 %endif
 %defattr(-,root,root)
@@ -768,6 +789,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sprd -f dtb-sprd.list
 %else
+
 %files -n dtb-sprd
 %endif
 %defattr(-,root,root)
@@ -795,6 +817,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-xilinx -f dtb-xilinx.list
 %else
+
 %files -n dtb-xilinx
 %endif
 %defattr(-,root,root)
@@ -803,8 +826,6 @@ cd /boot
 %dir %{dtbdir}/xilinx
 %{dtbdir}/xilinx/*.dtb
 
-
-
 %prep
 # Unpack all sources and patches
 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109 -a 110 -a 111 -a 113 -a 114 -a 120 -a 121
--- dtb-armv6l.spec.orig
+++ dtb-armv6l.spec
@@ -195,6 +195,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-bcm2835 -f dtb-bcm2835.list
 %else
+
 %files -n dtb-bcm2835
 %endif
 %defattr(-,root,root)
@@ -203,8 +204,6 @@ cd /boot
 %dir %{dtbdir}/broadcom
 %{dtbdir}/broadcom/bcm2835*.dtb
 
-
-
 %prep
 # Unpack all sources and patches
 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109 -a 110 -a 111 -a 113 -a 114 -a 120 -a 121
--- dtb-armv7l.spec.orig
+++ dtb-armv7l.spec
@@ -195,6 +195,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-am335x -f dtb-am335x.list
 %else
+
 %files -n dtb-am335x
 %endif
 %defattr(-,root,root)
@@ -223,6 +224,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-am3517 -f dtb-am3517.list
 %else
+
 %files -n dtb-am3517
 %endif
 %defattr(-,root,root)
@@ -251,6 +253,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-am57xx -f dtb-am57xx.list
 %else
+
 %files -n dtb-am57xx
 %endif
 %defattr(-,root,root)
@@ -279,6 +282,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-armada-370 -f dtb-armada-370.list
 %else
+
 %files -n dtb-armada-370
 %endif
 %defattr(-,root,root)
@@ -306,6 +310,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-armada-375 -f dtb-armada-375.list
 %else
+
 %files -n dtb-armada-375
 %endif
 %defattr(-,root,root)
@@ -333,6 +338,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-armada-385 -f dtb-armada-385.list
 %else
+
 %files -n dtb-armada-385
 %endif
 %defattr(-,root,root)
@@ -360,6 +366,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-armada-388 -f dtb-armada-388.list
 %else
+
 %files -n dtb-armada-388
 %endif
 %defattr(-,root,root)
@@ -387,6 +394,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-armada-398 -f dtb-armada-398.list
 %else
+
 %files -n dtb-armada-398
 %endif
 %defattr(-,root,root)
@@ -414,6 +422,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-armada-xp -f dtb-armada-xp.list
 %else
+
 %files -n dtb-armada-xp
 %endif
 %defattr(-,root,root)
@@ -441,6 +450,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-bcm2836 -f dtb-bcm2836.list
 %else
+
 %files -n dtb-bcm2836
 %endif
 %defattr(-,root,root)
@@ -468,6 +478,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-dove -f dtb-dove.list
 %else
+
 %files -n dtb-dove
 %endif
 %defattr(-,root,root)
@@ -495,6 +506,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-exynos4 -f dtb-exynos4.list
 %else
+
 %files -n dtb-exynos4
 %endif
 %defattr(-,root,root)
@@ -522,6 +534,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-exynos5 -f dtb-exynos5.list
 %else
+
 %files -n dtb-exynos5
 %endif
 %defattr(-,root,root)
@@ -549,6 +562,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-imx5 -f dtb-imx5.list
 %else
+
 %files -n dtb-imx5
 %endif
 %defattr(-,root,root)
@@ -577,6 +591,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-imx6 -f dtb-imx6.list
 %else
+
 %files -n dtb-imx6
 %endif
 %defattr(-,root,root)
@@ -605,6 +620,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-imx7 -f dtb-imx7.list
 %else
+
 %files -n dtb-imx7
 %endif
 %defattr(-,root,root)
@@ -635,6 +651,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-keystone -f dtb-keystone.list
 %else
+
 %files -n dtb-keystone
 %endif
 %defattr(-,root,root)
@@ -663,6 +680,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-meson8 -f dtb-meson8.list
 %else
+
 %files -n dtb-meson8
 %endif
 %defattr(-,root,root)
@@ -690,6 +708,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-meson8b -f dtb-meson8b.list
 %else
+
 %files -n dtb-meson8b
 %endif
 %defattr(-,root,root)
@@ -717,6 +736,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-mt76 -f dtb-mt76.list
 %else
+
 %files -n dtb-mt76
 %endif
 %defattr(-,root,root)
@@ -744,6 +764,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-omap3 -f dtb-omap3.list
 %else
+
 %files -n dtb-omap3
 %endif
 %defattr(-,root,root)
@@ -772,6 +793,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-omap4 -f dtb-omap4.list
 %else
+
 %files -n dtb-omap4
 %endif
 %defattr(-,root,root)
@@ -800,6 +822,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-omap5 -f dtb-omap5.list
 %else
+
 %files -n dtb-omap5
 %endif
 %defattr(-,root,root)
@@ -828,6 +851,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-qcom -f dtb-qcom.list
 %else
+
 %files -n dtb-qcom
 %endif
 %defattr(-,root,root)
@@ -855,6 +879,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-rk3 -f dtb-rk3.list
 %else
+
 %files -n dtb-rk3
 %endif
 %defattr(-,root,root)
@@ -882,6 +907,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-socfpga -f dtb-socfpga.list
 %else
+
 %files -n dtb-socfpga
 %endif
 %defattr(-,root,root)
@@ -910,6 +936,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-ste -f dtb-ste.list
 %else
+
 %files -n dtb-ste
 %endif
 %defattr(-,root,root)
@@ -937,6 +964,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun4i -f dtb-sun4i.list
 %else
+
 %files -n dtb-sun4i
 %endif
 %defattr(-,root,root)
@@ -964,6 +992,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun5i -f dtb-sun5i.list
 %else
+
 %files -n dtb-sun5i
 %endif
 %defattr(-,root,root)
@@ -991,6 +1020,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun6i -f dtb-sun6i.list
 %else
+
 %files -n dtb-sun6i
 %endif
 %defattr(-,root,root)
@@ -1018,6 +1048,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun7i -f dtb-sun7i.list
 %else
+
 %files -n dtb-sun7i
 %endif
 %defattr(-,root,root)
@@ -1045,6 +1076,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun8i -f dtb-sun8i.list
 %else
+
 %files -n dtb-sun8i
 %endif
 %defattr(-,root,root)
@@ -1072,6 +1104,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun9i -f dtb-sun9i.list
 %else
+
 %files -n dtb-sun9i
 %endif
 %defattr(-,root,root)
@@ -1099,6 +1132,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra2 -f dtb-tegra2.list
 %else
+
 %files -n dtb-tegra2
 %endif
 %defattr(-,root,root)
@@ -1126,6 +1160,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra3 -f dtb-tegra3.list
 %else
+
 %files -n dtb-tegra3
 %endif
 %defattr(-,root,root)
@@ -1153,6 +1188,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra114 -f dtb-tegra114.list
 %else
+
 %files -n dtb-tegra114
 %endif
 %defattr(-,root,root)
@@ -1180,6 +1216,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra124 -f dtb-tegra124.list
 %else
+
 %files -n dtb-tegra124
 %endif
 %defattr(-,root,root)
@@ -1207,6 +1244,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-vexpress -f dtb-vexpress.list
 %else
+
 %files -n dtb-vexpress
 %endif
 %defattr(-,root,root)
@@ -1234,6 +1272,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-vf500 -f dtb-vf500.list
 %else
+
 %files -n dtb-vf500
 %endif
 %defattr(-,root,root)
@@ -1262,6 +1301,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-vf6 -f dtb-vf6.list
 %else
+
 %files -n dtb-vf6
 %endif
 %defattr(-,root,root)
@@ -1290,6 +1330,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-xenvm -f dtb-xenvm.list
 %else
+
 %files -n dtb-xenvm
 %endif
 %defattr(-,root,root)
@@ -1317,6 +1358,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-zynq -f dtb-zynq.list
 %else
+
 %files -n dtb-zynq
 %endif
 %defattr(-,root,root)
@@ -1325,8 +1367,6 @@ cd /boot
 %dir %{dtbdir}/xilinx
 %{dtbdir}/xilinx/zynq-*.dtb
 
-
-
 %prep
 # Unpack all sources and patches
 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109 -a 110 -a 111 -a 113 -a 114 -a 120 -a 121
--- dtb-riscv64.spec.orig
+++ dtb-riscv64.spec
@@ -195,6 +195,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-allwinner -f dtb-allwinner.list
 %else
+
 %files -n dtb-allwinner
 %endif
 %defattr(-,root,root)
@@ -222,6 +223,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-microchip -f dtb-microchip.list
 %else
+
 %files -n dtb-microchip
 %endif
 %defattr(-,root,root)
@@ -249,6 +251,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-renesas -f dtb-renesas.list
 %else
+
 %files -n dtb-renesas
 %endif
 %defattr(-,root,root)
@@ -276,6 +279,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sifive -f dtb-sifive.list
 %else
+
 %files -n dtb-sifive
 %endif
 %defattr(-,root,root)
@@ -303,6 +307,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sophgo -f dtb-sophgo.list
 %else
+
 %files -n dtb-sophgo
 %endif
 %defattr(-,root,root)
@@ -330,6 +335,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-starfive -f dtb-starfive.list
 %else
+
 %files -n dtb-starfive
 %endif
 %defattr(-,root,root)
@@ -357,6 +363,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-thead -f dtb-thead.list
 %else
+
 %files -n dtb-thead
 %endif
 %defattr(-,root,root)
@@ -365,8 +372,6 @@ cd /boot
 %dir %{dtbdir}/thead
 %{dtbdir}/thead/*.dtb
 
-
-
 %prep
 # Unpack all sources and patches
 %setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109 -a 110 -a 111 -a 113 -a 114 -a 120 -a 121
--- kernel-64kb.spec.orig
+++ kernel-64kb.spec
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -438,6 +438,7 @@ configured with 64kb page size granule.
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -445,6 +446,7 @@ configured with 64kb page size granule.
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -452,6 +454,7 @@ configured with 64kb page size granule.
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -459,6 +462,7 @@ configured with 64kb page size granule.
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -466,13 +470,14 @@ configured with 64kb page size granule.
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        Kernel with 64kb PAGE_SIZE - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -543,6 +548,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -589,9 +595,9 @@ Requires(post): modutils
 Requires(post): perl-Bootloader
 Requires(post): dracut
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -729,6 +735,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -745,6 +752,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -757,11 +765,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -821,17 +829,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -847,8 +856,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -872,8 +881,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -927,8 +936,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -980,8 +989,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1033,8 +1042,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1101,8 +1110,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1155,8 +1164,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package
--- kernel-default.spec.orig
+++ kernel-default.spec
@@ -93,12 +93,12 @@ BuildRequires:  suse-kabi-tools
 # Remove some packages that are installed automatically by the build system,
 # but are not needed to build the kernel
 #!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools udev insserv
-ExclusiveArch:  aarch64 armv6hl armv7hl %ix86 ppc64le riscv64 s390x x86_64
+ExclusiveArch:  aarch64 armv6hl armv7hl %ix86 loongarch64 ppc64le riscv64 s390x x86_64
 
 %ifarch %ix86 x86_64
 %define image vmlinuz
 %endif
-%ifarch ppc ppc64 ppc64le
+%ifarch loongarch64 ppc ppc64 ppc64le
 %define image vmlinux
 %endif
 %ifarch s390 s390x
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -475,6 +475,7 @@ The standard kernel for both uniprocesso
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -482,6 +483,7 @@ The standard kernel for both uniprocesso
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -489,6 +491,7 @@ The standard kernel for both uniprocesso
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -496,6 +499,7 @@ The standard kernel for both uniprocesso
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -503,13 +507,14 @@ The standard kernel for both uniprocesso
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        The Standard Kernel - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -597,6 +602,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -663,9 +669,9 @@ Provides:       kernel-ec2-extra = 4.4
 Obsoletes:      kernel-ec2-extra <= 4.4
 %endif
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -817,6 +823,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -833,6 +840,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -845,11 +853,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -929,17 +937,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -955,8 +964,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -980,8 +989,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -1035,8 +1044,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -1088,8 +1097,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1141,8 +1150,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1209,8 +1218,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1263,8 +1272,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package
@@ -1614,7 +1623,7 @@ add_vmlinux()
     add_vmlinux --compressed
     cp -p arch/x86/boot/bzImage %buildroot/boot/%image-%kernelrelease-%build_flavor
 %endif
-%ifarch ppc ppc64 ppc64le
+%ifarch loongarch64 ppc ppc64 ppc64le
     add_vmlinux
 %endif
 %ifarch s390 s390x
@@ -1659,7 +1668,7 @@ BRP_PESIGN_FILES="/boot/%image-%kernelre
 %endif
 %endif
 %if ! %sb_efi_only
-%ifarch s390x ppc64 ppc64le
+%ifarch loongarch64 ppc64 ppc64le s390x
 %if %{usrmerged}
 BRP_PESIGN_FILES="%modules_dir/%image"
 %else
--- kernel-docs.spec.orig
+++ kernel-docs.spec
@@ -52,18 +52,18 @@ BuildRequires:  graphviz
 BuildRequires:  graphviz-gd
 BuildRequires:  graphviz-gnome
 %if ! 0%{?suse_version} || 0%{?suse_version} > 1500
-BuildRequires:  python3-base
 BuildRequires:  python3-PyYAML
 BuildRequires:  python3-Sphinx
+BuildRequires:  python3-base
 BuildRequires:  texlive-amscls
 %else
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
+BuildRequires:  python-Sphinx
 BuildRequires:  python-packaging
 BuildRequires:  python-six
-BuildRequires:  python-Sphinx
 %else
-BuildRequires:  python3-base
 BuildRequires:  python3-Sphinx < 3
+BuildRequires:  python3-base
 %endif
 %endif
 BuildRequires:  texlive-anyfontsize
@@ -71,8 +71,8 @@ BuildRequires:  texlive-anyfontsize
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 BuildRequires:  python-Sphinx-latex
 %else
-BuildRequires:  python3-base
 BuildRequires:  python3-Sphinx-latex
+BuildRequires:  python3-base
 %endif
 BuildRequires:  texlive-adjustbox
 BuildRequires:  texlive-dejavu
--- kernel-kvmsmall.spec.orig
+++ kernel-kvmsmall.spec
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -442,6 +442,7 @@ very quickly.  The configuration may cha
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -449,6 +450,7 @@ very quickly.  The configuration may cha
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -456,6 +458,7 @@ very quickly.  The configuration may cha
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -463,6 +466,7 @@ very quickly.  The configuration may cha
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -470,13 +474,14 @@ very quickly.  The configuration may cha
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        The Small Developer Kernel for KVM - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -551,6 +556,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -597,9 +603,9 @@ Requires(post): modutils
 Requires(post): perl-Bootloader
 Requires(post): dracut
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -745,6 +751,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -761,6 +768,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -773,11 +781,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -837,17 +845,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -863,8 +872,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -888,8 +897,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -943,8 +952,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -996,8 +1005,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1049,8 +1058,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1117,8 +1126,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1171,8 +1180,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package
--- kernel-lpae.spec.orig
+++ kernel-lpae.spec
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -436,6 +436,7 @@ Cortex A15 based SoCs, like the Exynos5,
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -443,6 +444,7 @@ Cortex A15 based SoCs, like the Exynos5,
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -450,6 +452,7 @@ Cortex A15 based SoCs, like the Exynos5,
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -457,6 +460,7 @@ Cortex A15 based SoCs, like the Exynos5,
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -464,13 +468,14 @@ Cortex A15 based SoCs, like the Exynos5,
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        Kernel for LPAE enabled systems - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -539,6 +544,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -585,9 +591,9 @@ Requires(post): modutils
 Requires(post): perl-Bootloader
 Requires(post): dracut
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -721,6 +727,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -737,6 +744,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -749,11 +757,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -813,17 +821,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -839,8 +848,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -864,8 +873,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -919,8 +928,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -972,8 +981,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1025,8 +1034,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1093,8 +1102,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1147,8 +1156,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package
--- kernel-obs-build.spec.orig
+++ kernel-obs-build.spec
@@ -55,10 +55,10 @@ Summary:        package kernel and initr
 License:        GPL-2.0-only
 Group:          SLES
 Provides:       kernel-obs-build-srchash-5eaf39104aeb1395c01cb45d337b29f6225af765
+BuildRequires:  %kernel_package
 BuildRequires:  coreutils
 BuildRequires:  device-mapper
 BuildRequires:  dracut
-BuildRequires:  %kernel_package
 BuildRequires:  util-linux
 %if 0%{?suse_version} > 1550 || 0%{?sle_version} > 150200
 BuildRequires:  zstd
--- kernel-pae.spec.orig
+++ kernel-pae.spec
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -458,6 +458,7 @@ that support it, regardless of the amoun
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -465,6 +466,7 @@ that support it, regardless of the amoun
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -472,6 +474,7 @@ that support it, regardless of the amoun
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -479,6 +482,7 @@ that support it, regardless of the amoun
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -486,13 +490,14 @@ that support it, regardless of the amoun
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        Kernel with PAE Support - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -575,6 +580,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -629,9 +635,9 @@ Provides:       kernel-ec2-extra = 4.4
 Obsoletes:      kernel-ec2-extra <= 4.4
 %endif
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -785,6 +791,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -801,6 +808,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -813,11 +821,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -885,17 +893,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -911,8 +920,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -936,8 +945,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -991,8 +1000,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -1044,8 +1053,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1097,8 +1106,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1165,8 +1174,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1219,8 +1228,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package
--- kernel-source.spec.orig
+++ kernel-source.spec
@@ -248,6 +248,7 @@ echo "Symbol(s): %symbols"
 %setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109 -a 110 -a 111 -a 113 -a 114 -a 120 -a 121
 
 %build
+
 %install
 mkdir -p %{buildroot}/usr/src
 pushd %{buildroot}/usr/src
--- kernel-syms.spec.orig
+++ kernel-syms.spec
@@ -54,8 +54,8 @@ Requires:       kernel-lpae-devel = %ver
 %ifarch %ix86
 Requires:       kernel-pae-devel = %version-%source_rel
 %endif
-Requires:       pesign-obs-integration
 Requires:       kernel-devel%variant = %version-%source_rel
+Requires:       pesign-obs-integration
 Provides:       %name = %version-%source_rel
 Provides:       %name-srchash-%git_commit
 Provides:       multiversion(kernel)
--- kernel-vanilla.spec.orig
+++ kernel-vanilla.spec
@@ -93,12 +93,12 @@ BuildRequires:  suse-kabi-tools
 # Remove some packages that are installed automatically by the build system,
 # but are not needed to build the kernel
 #!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools udev insserv
-ExclusiveArch:  aarch64 armv6hl armv7hl %ix86 ppc64le riscv64 s390x x86_64
+ExclusiveArch:  aarch64 armv6hl armv7hl %ix86 loongarch64 ppc64le riscv64 s390x x86_64
 
 %ifarch %ix86 x86_64
 %define image vmlinuz
 %endif
-%ifarch ppc ppc64 ppc64le
+%ifarch loongarch64 ppc ppc64 ppc64le
 %define image vmlinux
 %endif
 %ifarch s390 s390x
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -435,6 +435,7 @@ The standard kernel - without any SUSE p
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -442,6 +443,7 @@ The standard kernel - without any SUSE p
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -449,6 +451,7 @@ The standard kernel - without any SUSE p
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -456,6 +459,7 @@ The standard kernel - without any SUSE p
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -463,13 +467,14 @@ The standard kernel - without any SUSE p
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        The Standard Kernel - without any SUSE patches - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -537,6 +542,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -583,9 +589,9 @@ Requires(post): modutils
 Requires(post): perl-Bootloader
 Requires(post): dracut
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -717,6 +723,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -733,6 +740,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -745,11 +753,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -809,17 +817,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -835,8 +844,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -860,8 +869,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -915,8 +924,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -968,8 +977,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1021,8 +1030,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1089,8 +1098,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1143,8 +1152,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package
@@ -1494,7 +1503,7 @@ add_vmlinux()
     add_vmlinux --compressed
     cp -p arch/x86/boot/bzImage %buildroot/boot/%image-%kernelrelease-%build_flavor
 %endif
-%ifarch ppc ppc64 ppc64le
+%ifarch ppc ppc64 loongarch64 ppc64le
     add_vmlinux
 %endif
 %ifarch s390 s390x
@@ -1539,7 +1548,7 @@ BRP_PESIGN_FILES="/boot/%image-%kernelre
 %endif
 %endif
 %if ! %sb_efi_only
-%ifarch s390x ppc64 ppc64le
+%ifarch loongarch64 ppc64 ppc64le s390x
 %if %{usrmerged}
 BRP_PESIGN_FILES="%modules_dir/%image"
 %else
--- kernel-zfcpdump.spec.orig
+++ kernel-zfcpdump.spec
@@ -333,7 +333,7 @@ Provides:       multiversion(kernel)
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
 %if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
-Recommends: kernel-firmware
+Recommends:     kernel-firmware
 %endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
@@ -438,6 +438,7 @@ should not be installed as a regular boo
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -445,6 +446,7 @@ should not be installed as a regular boo
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -452,6 +454,7 @@ should not be installed as a regular boo
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -459,6 +462,7 @@ should not be installed as a regular boo
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -466,13 +470,14 @@ should not be installed as a regular boo
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "%{usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        The IBM System Z zfcpdump Kernel - base modules
 Group:          System/Kernel
-Url:            http://www.kernel.org/
+URL:            http://www.kernel.org/
 Provides:       kernel-base = %version-%source_rel
 Provides:       multiversion(kernel)
 Conflicts:      %name = %version-%source_rel
@@ -543,6 +548,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -589,9 +595,9 @@ Requires(post): modutils
 Requires(post): perl-Bootloader
 Requires(post): dracut
 %obsolete_rebuilds %name-extra
+Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 Supplements:    packageand(product(SLED):%{name}_%_target_cpu)
 Supplements:    packageand(product(sle-we):%{name}_%_target_cpu)
-Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -729,6 +735,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -745,6 +752,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 %dir %modules_dir
 %modules_dir/vdso/
@@ -757,11 +765,11 @@ Provides:       %name-devel = %version-%
 Provides:       multiversion(kernel)
 %if ! %build_vanilla && ! %vanilla_only
 Requires:       kernel-devel%variant = %version-%source_rel
-Recommends:     make
 Recommends:     gcc
+Recommends:     make
 Recommends:     perl
 # for objtool
-Requires:	libelf-devel
+Requires:       libelf-devel
 Supplements:    packageand(%name:kernel-devel%variant)
 %else
 Requires:       kernel-source-vanilla = %version-%source_rel
@@ -821,17 +829,18 @@ relink ../../linux-%{kernelrelease}%{var
 %else
 %define patch_package kernel-%{livepatch}
 %endif
+
 %package %{livepatch}
 Summary:        Metapackage to pull in matching %patch_package package
 Group:          System/Kernel
 Requires:       %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
 Provides:       multiversion(kernel)
 %if "%variant" != "-rt"
-Provides:	kernel-default-kgraft = %version
-Provides:	kernel-xen-kgraft = %version
+Provides:       kernel-default-kgraft = %version
+Provides:       kernel-xen-kgraft = %version
 %if "%livepatch" != "kgraft"
-Obsoletes:	kernel-default-kgraft < %version
-Obsoletes:	kernel-xen-kgraft < %version
+Obsoletes:      kernel-default-kgraft < %version
+Obsoletes:      kernel-xen-kgraft < %version
 %endif
 %endif
 
@@ -847,8 +856,8 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_ipa_clones} && "%livepatch" != "" && "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
 
 %description %{livepatch}-devel
 This package brings ipa-clones files, which are used to to track
@@ -872,8 +881,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       cluster-md-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:cluster-md-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:cluster-md-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n cluster-md-kmp-%build_flavor
@@ -927,8 +936,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       dlm-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:dlm-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:dlm-kmp-%build_flavor)
 
 %description -n dlm-kmp-%build_flavor
 DLM stands for Distributed Lock Manager, a means to synchronize access to
@@ -980,8 +989,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       gfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:gfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:gfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n gfs2-kmp-%build_flavor
@@ -1033,8 +1042,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       kselftests-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:kselftests-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:kselftests-kmp-%build_flavor)
 
 %description -n kselftests-kmp-%build_flavor
 This package contains kernel modules which are part of the upstream kernel
@@ -1101,8 +1110,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       ocfs2-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:ocfs2-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:ocfs2-kmp-%build_flavor)
 Requires:       dlm-kmp-%build_flavor = %version-%release
 
 %description -n ocfs2-kmp-%build_flavor
@@ -1155,8 +1164,8 @@ Requires(post): suse-module-tools >= 12.
 Provides:       reiserfs-kmp-preempt = %version-%release
 %endif
 %endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
+Enhances:       %name
+Supplements:    packageand(%name:reiserfs-kmp-%build_flavor)
 
 %description -n reiserfs-kmp-%build_flavor
 The reiserfs file system is no longer supported in SLE15.  This package