File project.diff of Package kernel-source

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package kernel-source (Revision 713234e1840d5b4335aa0f9f552e9109)

Currently displaying revision 713234e1840d5b4335aa0f9f552e9109 , Show latest

--- dtb-aarch64.spec.orig
+++ dtb-aarch64.spec
@@ -400,15 +400,12 @@ Requires(post): coreutils
 %description -n dtb-xilinx
 Device Tree files for Xilinx based arm64 systems.
 
-
-
 %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
 cd linux-%srcversion
 %_sourcedir/apply-patches %_sourcedir/series.conf ..
 
-
 %build
 source=linux-%srcversion
 cp $source/COPYING .
@@ -616,6 +613,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-allwinner -f dtb-allwinner.list
 %else
+
 %files -n dtb-allwinner
 %endif
 %defattr(-,root,root)
@@ -627,6 +625,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-altera -f dtb-altera.list
 %else
+
 %files -n dtb-altera
 %endif
 %defattr(-,root,root)
@@ -638,6 +637,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-amazon -f dtb-amazon.list
 %else
+
 %files -n dtb-amazon
 %endif
 %defattr(-,root,root)
@@ -649,6 +649,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-amd -f dtb-amd.list
 %else
+
 %files -n dtb-amd
 %endif
 %defattr(-,root,root)
@@ -660,6 +661,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-amlogic -f dtb-amlogic.list
 %else
+
 %files -n dtb-amlogic
 %endif
 %defattr(-,root,root)
@@ -671,6 +673,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-apm -f dtb-apm.list
 %else
+
 %files -n dtb-apm
 %endif
 %defattr(-,root,root)
@@ -682,6 +685,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-apple -f dtb-apple.list
 %else
+
 %files -n dtb-apple
 %endif
 %defattr(-,root,root)
@@ -693,6 +697,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-arm -f dtb-arm.list
 %else
+
 %files -n dtb-arm
 %endif
 %defattr(-,root,root)
@@ -704,6 +709,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-broadcom -f dtb-broadcom.list
 %else
+
 %files -n dtb-broadcom
 %endif
 %defattr(-,root,root)
@@ -715,6 +721,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-cavium -f dtb-cavium.list
 %else
+
 %files -n dtb-cavium
 %endif
 %defattr(-,root,root)
@@ -726,6 +733,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-exynos -f dtb-exynos.list
 %else
+
 %files -n dtb-exynos
 %endif
 %defattr(-,root,root)
@@ -737,6 +745,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-freescale -f dtb-freescale.list
 %else
+
 %files -n dtb-freescale
 %endif
 %defattr(-,root,root)
@@ -748,6 +757,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-hisilicon -f dtb-hisilicon.list
 %else
+
 %files -n dtb-hisilicon
 %endif
 %defattr(-,root,root)
@@ -759,6 +769,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-lg -f dtb-lg.list
 %else
+
 %files -n dtb-lg
 %endif
 %defattr(-,root,root)
@@ -770,6 +781,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-marvell -f dtb-marvell.list
 %else
+
 %files -n dtb-marvell
 %endif
 %defattr(-,root,root)
@@ -781,6 +793,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-mediatek -f dtb-mediatek.list
 %else
+
 %files -n dtb-mediatek
 %endif
 %defattr(-,root,root)
@@ -792,6 +805,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-nvidia -f dtb-nvidia.list
 %else
+
 %files -n dtb-nvidia
 %endif
 %defattr(-,root,root)
@@ -803,6 +817,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-qcom -f dtb-qcom.list
 %else
+
 %files -n dtb-qcom
 %endif
 %defattr(-,root,root)
@@ -814,6 +829,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-renesas -f dtb-renesas.list
 %else
+
 %files -n dtb-renesas
 %endif
 %defattr(-,root,root)
@@ -825,6 +841,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-rockchip -f dtb-rockchip.list
 %else
+
 %files -n dtb-rockchip
 %endif
 %defattr(-,root,root)
@@ -836,6 +853,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-socionext -f dtb-socionext.list
 %else
+
 %files -n dtb-socionext
 %endif
 %defattr(-,root,root)
@@ -847,6 +865,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sprd -f dtb-sprd.list
 %else
+
 %files -n dtb-sprd
 %endif
 %defattr(-,root,root)
@@ -858,6 +877,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-xilinx -f dtb-xilinx.list
 %else
+
 %files -n dtb-xilinx
 %endif
 %defattr(-,root,root)
--- dtb-armv6l.spec.orig
+++ dtb-armv6l.spec
@@ -196,15 +196,12 @@ Requires(post): coreutils
 %description -n dtb-bcm2835
 Device Tree files for Raspberry Pi 1 (A+, B, B+).
 
-
-
 %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
 cd linux-%srcversion
 %_sourcedir/apply-patches %_sourcedir/series.conf ..
 
-
 %build
 source=linux-%srcversion
 cp $source/COPYING .
@@ -259,6 +256,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-bcm2835 -f dtb-bcm2835.list
 %else
+
 %files -n dtb-bcm2835
 %endif
 %defattr(-,root,root)
--- dtb-armv7l.spec.orig
+++ dtb-armv7l.spec
@@ -576,15 +576,12 @@ Requires(post): coreutils
 %description -n dtb-zynq
 Device Tree files for Xilinx Zynq based systems.
 
-
-
 %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
 cd linux-%srcversion
 %_sourcedir/apply-patches %_sourcedir/series.conf ..
 
-
 %build
 source=linux-%srcversion
 cp $source/COPYING .
@@ -975,6 +972,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-am335x -f dtb-am335x.list
 %else
+
 %files -n dtb-am335x
 %endif
 %defattr(-,root,root)
@@ -987,6 +985,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-am3517 -f dtb-am3517.list
 %else
+
 %files -n dtb-am3517
 %endif
 %defattr(-,root,root)
@@ -999,6 +998,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-am57xx -f dtb-am57xx.list
 %else
+
 %files -n dtb-am57xx
 %endif
 %defattr(-,root,root)
@@ -1011,6 +1011,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)
@@ -1022,6 +1023,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)
@@ -1033,6 +1035,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)
@@ -1044,6 +1047,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)
@@ -1055,6 +1059,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)
@@ -1066,6 +1071,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)
@@ -1077,6 +1083,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-bcm2836 -f dtb-bcm2836.list
 %else
+
 %files -n dtb-bcm2836
 %endif
 %defattr(-,root,root)
@@ -1088,6 +1095,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-dove -f dtb-dove.list
 %else
+
 %files -n dtb-dove
 %endif
 %defattr(-,root,root)
@@ -1099,6 +1107,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-exynos4 -f dtb-exynos4.list
 %else
+
 %files -n dtb-exynos4
 %endif
 %defattr(-,root,root)
@@ -1110,6 +1119,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-exynos5 -f dtb-exynos5.list
 %else
+
 %files -n dtb-exynos5
 %endif
 %defattr(-,root,root)
@@ -1121,6 +1131,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-imx5 -f dtb-imx5.list
 %else
+
 %files -n dtb-imx5
 %endif
 %defattr(-,root,root)
@@ -1133,6 +1144,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-imx6 -f dtb-imx6.list
 %else
+
 %files -n dtb-imx6
 %endif
 %defattr(-,root,root)
@@ -1145,6 +1157,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-imx7 -f dtb-imx7.list
 %else
+
 %files -n dtb-imx7
 %endif
 %defattr(-,root,root)
@@ -1157,6 +1170,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-keystone -f dtb-keystone.list
 %else
+
 %files -n dtb-keystone
 %endif
 %defattr(-,root,root)
@@ -1169,6 +1183,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-meson6 -f dtb-meson6.list
 %else
+
 %files -n dtb-meson6
 %endif
 %defattr(-,root,root)
@@ -1180,6 +1195,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-meson8 -f dtb-meson8.list
 %else
+
 %files -n dtb-meson8
 %endif
 %defattr(-,root,root)
@@ -1191,6 +1207,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-meson8b -f dtb-meson8b.list
 %else
+
 %files -n dtb-meson8b
 %endif
 %defattr(-,root,root)
@@ -1202,6 +1219,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-mt76 -f dtb-mt76.list
 %else
+
 %files -n dtb-mt76
 %endif
 %defattr(-,root,root)
@@ -1213,6 +1231,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-omap3 -f dtb-omap3.list
 %else
+
 %files -n dtb-omap3
 %endif
 %defattr(-,root,root)
@@ -1225,6 +1244,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-omap4 -f dtb-omap4.list
 %else
+
 %files -n dtb-omap4
 %endif
 %defattr(-,root,root)
@@ -1237,6 +1257,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-omap5 -f dtb-omap5.list
 %else
+
 %files -n dtb-omap5
 %endif
 %defattr(-,root,root)
@@ -1249,6 +1270,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-qcom -f dtb-qcom.list
 %else
+
 %files -n dtb-qcom
 %endif
 %defattr(-,root,root)
@@ -1260,6 +1282,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-rk3 -f dtb-rk3.list
 %else
+
 %files -n dtb-rk3
 %endif
 %defattr(-,root,root)
@@ -1271,6 +1294,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-socfpga -f dtb-socfpga.list
 %else
+
 %files -n dtb-socfpga
 %endif
 %defattr(-,root,root)
@@ -1283,6 +1307,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-ste -f dtb-ste.list
 %else
+
 %files -n dtb-ste
 %endif
 %defattr(-,root,root)
@@ -1294,6 +1319,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun4i -f dtb-sun4i.list
 %else
+
 %files -n dtb-sun4i
 %endif
 %defattr(-,root,root)
@@ -1305,6 +1331,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun5i -f dtb-sun5i.list
 %else
+
 %files -n dtb-sun5i
 %endif
 %defattr(-,root,root)
@@ -1316,6 +1343,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun6i -f dtb-sun6i.list
 %else
+
 %files -n dtb-sun6i
 %endif
 %defattr(-,root,root)
@@ -1327,6 +1355,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun7i -f dtb-sun7i.list
 %else
+
 %files -n dtb-sun7i
 %endif
 %defattr(-,root,root)
@@ -1338,6 +1367,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun8i -f dtb-sun8i.list
 %else
+
 %files -n dtb-sun8i
 %endif
 %defattr(-,root,root)
@@ -1349,6 +1379,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sun9i -f dtb-sun9i.list
 %else
+
 %files -n dtb-sun9i
 %endif
 %defattr(-,root,root)
@@ -1360,6 +1391,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra2 -f dtb-tegra2.list
 %else
+
 %files -n dtb-tegra2
 %endif
 %defattr(-,root,root)
@@ -1371,6 +1403,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra3 -f dtb-tegra3.list
 %else
+
 %files -n dtb-tegra3
 %endif
 %defattr(-,root,root)
@@ -1382,6 +1415,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra114 -f dtb-tegra114.list
 %else
+
 %files -n dtb-tegra114
 %endif
 %defattr(-,root,root)
@@ -1393,6 +1427,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-tegra124 -f dtb-tegra124.list
 %else
+
 %files -n dtb-tegra124
 %endif
 %defattr(-,root,root)
@@ -1404,6 +1439,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-vexpress -f dtb-vexpress.list
 %else
+
 %files -n dtb-vexpress
 %endif
 %defattr(-,root,root)
@@ -1415,6 +1451,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-vf500 -f dtb-vf500.list
 %else
+
 %files -n dtb-vf500
 %endif
 %defattr(-,root,root)
@@ -1427,6 +1464,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-vf6 -f dtb-vf6.list
 %else
+
 %files -n dtb-vf6
 %endif
 %defattr(-,root,root)
@@ -1439,6 +1477,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-xenvm -f dtb-xenvm.list
 %else
+
 %files -n dtb-xenvm
 %endif
 %defattr(-,root,root)
@@ -1450,6 +1489,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-zynq -f dtb-zynq.list
 %else
+
 %files -n dtb-zynq
 %endif
 %defattr(-,root,root)
--- dtb-riscv64.spec.orig
+++ dtb-riscv64.spec
@@ -250,15 +250,12 @@ Requires(post): coreutils
 %description -n dtb-thead
 Device Tree files for T-HEAD based riscv64 systems.
 
-
-
 %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
 cd linux-%srcversion
 %_sourcedir/apply-patches %_sourcedir/series.conf ..
 
-
 %build
 source=linux-%srcversion
 cp $source/COPYING .
@@ -354,6 +351,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-allwinner -f dtb-allwinner.list
 %else
+
 %files -n dtb-allwinner
 %endif
 %defattr(-,root,root)
@@ -365,6 +363,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-microchip -f dtb-microchip.list
 %else
+
 %files -n dtb-microchip
 %endif
 %defattr(-,root,root)
@@ -376,6 +375,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-renesas -f dtb-renesas.list
 %else
+
 %files -n dtb-renesas
 %endif
 %defattr(-,root,root)
@@ -387,6 +387,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sifive -f dtb-sifive.list
 %else
+
 %files -n dtb-sifive
 %endif
 %defattr(-,root,root)
@@ -398,6 +399,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-sophgo -f dtb-sophgo.list
 %else
+
 %files -n dtb-sophgo
 %endif
 %defattr(-,root,root)
@@ -409,6 +411,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-starfive -f dtb-starfive.list
 %else
+
 %files -n dtb-starfive
 %endif
 %defattr(-,root,root)
@@ -420,6 +423,7 @@ cd /boot
 %ifarch %arm aarch64 riscv64
 %files -n dtb-thead -f dtb-thead.list
 %else
+
 %files -n dtb-thead
 %endif
 %defattr(-,root,root)
--- kernel-64kb.spec.orig
+++ kernel-64kb.spec
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -435,6 +435,7 @@ configured with 64kb page size granule.
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1226,6 +1227,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1233,6 +1235,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1240,6 +1243,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1247,6 +1251,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1254,21 +1259,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1330,6 +1336,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1376,9 +1383,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
@@ -1516,6 +1523,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1532,6 +1540,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1543,11 +1552,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
@@ -1601,17 +1610,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
 
@@ -1627,9 +1637,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1655,8 +1665,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
@@ -1710,8 +1720,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
@@ -1763,8 +1773,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
@@ -1816,8 +1826,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
@@ -1884,8 +1894,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
@@ -1938,8 +1948,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-debug.spec.orig
+++ kernel-debug.spec
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -433,6 +433,7 @@ Only use this kernel when investigating
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1224,6 +1225,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1231,6 +1233,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1238,6 +1241,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1245,6 +1249,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1252,21 +1257,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %files -f kernel-main.files
 
 %if "%CONFIG_MODULES" == "y" && %split_base
 %package base
 Summary:        A Debug Version of the 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1326,6 +1332,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1372,9 +1379,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
@@ -1508,6 +1515,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1524,6 +1532,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1535,11 +1544,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
@@ -1593,17 +1602,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
 
@@ -1619,9 +1629,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1647,8 +1657,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
@@ -1702,8 +1712,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
@@ -1755,8 +1765,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
@@ -1808,8 +1818,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
@@ -1876,8 +1886,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
@@ -1930,8 +1940,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
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -472,6 +472,7 @@ The standard kernel for both uniprocesso
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1263,6 +1264,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1270,6 +1272,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1277,6 +1280,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1284,6 +1288,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1291,21 +1296,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1384,6 +1390,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1450,9 +1457,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
@@ -1604,6 +1611,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1620,6 +1628,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1631,11 +1640,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
@@ -1709,17 +1718,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
 
@@ -1735,9 +1745,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1763,8 +1773,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
@@ -1818,8 +1828,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
@@ -1871,8 +1881,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
@@ -1924,8 +1934,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
@@ -1992,8 +2002,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
@@ -2046,8 +2056,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-docs.spec.orig
+++ kernel-docs.spec
@@ -51,18 +51,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
@@ -70,8 +70,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
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -439,6 +439,7 @@ very quickly.  The configuration may cha
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1230,6 +1231,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1237,6 +1239,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1244,6 +1247,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1251,6 +1255,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1258,21 +1263,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1338,6 +1344,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1384,9 +1391,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
@@ -1532,6 +1539,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1548,6 +1556,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1559,11 +1568,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
@@ -1617,17 +1626,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
 
@@ -1643,9 +1653,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1671,8 +1681,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
@@ -1726,8 +1736,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
@@ -1779,8 +1789,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
@@ -1832,8 +1842,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
@@ -1900,8 +1910,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
@@ -1954,8 +1964,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
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -433,6 +433,7 @@ Cortex A15 based SoCs, like the Exynos5,
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1224,6 +1225,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1231,6 +1233,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1238,6 +1241,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1245,6 +1249,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1252,21 +1257,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1326,6 +1332,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1372,9 +1379,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
@@ -1508,6 +1515,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1524,6 +1532,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1535,11 +1544,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
@@ -1593,17 +1602,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
 
@@ -1619,9 +1629,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1647,8 +1657,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
@@ -1702,8 +1712,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
@@ -1755,8 +1765,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
@@ -1808,8 +1818,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
@@ -1876,8 +1886,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
@@ -1930,8 +1940,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-pae.spec.orig
+++ kernel-pae.spec
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -455,6 +455,7 @@ that support it, regardless of the amoun
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1246,6 +1247,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1253,6 +1255,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1260,6 +1263,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1267,6 +1271,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1274,21 +1279,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1362,6 +1368,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1416,9 +1423,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
@@ -1572,6 +1579,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1588,6 +1596,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1599,11 +1608,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
@@ -1665,17 +1674,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
 
@@ -1691,9 +1701,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1719,8 +1729,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
@@ -1774,8 +1784,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
@@ -1827,8 +1837,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
@@ -1880,8 +1890,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
@@ -1948,8 +1958,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
@@ -2002,8 +2012,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
@@ -166,6 +166,7 @@ Linux kernel sources with many fixes and
 
 
 %source_timestamp
+
 %package -n kernel-devel%variant
 %obsolete_rebuilds kernel-devel%variant
 Summary:        Development files needed for building kernel modules
@@ -184,6 +185,7 @@ external kernel modules.
 
 # Note: The kernel-macros package intentionally does not provide
 # multiversion(kernel) nor is its name decorated with the variant (-rt)
+
 %package -n kernel-macros
 Summary:        RPM macros for building Kernel Module Packages
 Group:          Development/Sources
@@ -221,6 +223,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
@@ -319,7 +322,6 @@ relink linux-%kernelrelease%variant /usr
 /usr/lib/rpm/kernel/*
 %endif
 
-
 %if %do_vanilla
 
 %files vanilla
--- kernel-syms.spec.orig
+++ kernel-syms.spec
@@ -79,6 +79,7 @@ package dependencies.
 
 
 %source_timestamp
+
 %prep
 
 %install
--- kernel-vanilla.spec.orig
+++ kernel-vanilla.spec
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -432,6 +432,7 @@ The standard kernel - without any SUSE p
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1223,6 +1224,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1230,6 +1232,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1237,6 +1240,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1244,6 +1248,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1251,21 +1256,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1324,6 +1330,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1370,9 +1377,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
@@ -1504,6 +1511,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1520,6 +1528,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1531,11 +1540,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
@@ -1589,17 +1598,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
 
@@ -1615,9 +1625,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1643,8 +1653,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
@@ -1698,8 +1708,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
@@ -1751,8 +1761,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
@@ -1804,8 +1814,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
@@ -1872,8 +1882,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
@@ -1926,8 +1936,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-zfcpdump.spec.orig
+++ kernel-zfcpdump.spec
@@ -339,15 +339,15 @@ 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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -435,6 +435,7 @@ should not be installed as a regular boo
 
 
 %source_timestamp
+
 %prep
 if ! [ -e %{S:0} ]; then
     echo "The %name-%version.nosrc.rpm package does not contain the" \
@@ -1226,6 +1227,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %post
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-post --name "%name" \
@@ -1233,6 +1235,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %preun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-preun --name "%name" \
@@ -1240,6 +1243,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %postun
 %if "%build_flavor" != "zfcpdump"
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/rpm-postun --name "%name" \
@@ -1247,6 +1251,7 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?usrmerged}" --certs "%certs" "$@"
 %endif
+
 %posttrans
 %if "%build_flavor" != "zfcpdump"
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-posttrans --name "%name" \
@@ -1254,21 +1259,22 @@ fi
   --image "%image" --flavor "%build_flavor" --variant "%variant" \
   --usrmerged "0%{?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
 Requires(pre):  suse-kernel-rpm-scriptlets
 Requires(post): suse-kernel-rpm-scriptlets
 Requires:       suse-kernel-rpm-scriptlets
-Requires(preun): suse-kernel-rpm-scriptlets
-Requires(postun): suse-kernel-rpm-scriptlets
+Requires(preun):suse-kernel-rpm-scriptlets
+Requires(postun):suse-kernel-rpm-scriptlets
 Requires(pre):  coreutils awk
 # For /usr/lib/module-init-tools/weak-modules2 and /usr/lib/modprobe.d/*.conf
 Requires(post): suse-module-tools
@@ -1330,6 +1336,7 @@ This package contains only the base modu
 
 
 %source_timestamp
+
 %pre base
 /usr/lib/module-init-tools/kernel-scriptlets/rpm-pre --name "%name-base" \
   --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
@@ -1376,9 +1383,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
@@ -1516,6 +1523,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1532,6 +1540,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1543,11 +1552,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
@@ -1601,17 +1610,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
 
@@ -1627,9 +1637,9 @@ static, unlike the %{patch_package}-<ker
 
 %if 0%{?klp_symbols} && "%livepatch" != ""
 %package %{livepatch}-devel
-Summary:	Kernel symbols file used during kGraft patch development
-Group:		System/Kernel
-Provides:	klp-symbols = %version
+Summary:        Kernel symbols file used during kGraft patch development
+Group:          System/Kernel
+Provides:       klp-symbols = %version
 
 %description %{livepatch}-devel
 This package brings a file named Symbols.list, which contains a list of all
@@ -1655,8 +1665,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
@@ -1710,8 +1720,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
@@ -1763,8 +1773,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
@@ -1816,8 +1826,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
@@ -1884,8 +1894,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
@@ -1938,8 +1948,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

Places

File project.diff of Package kernel-source (Revision 713234e1840d5b4335aa0f9f552e9109)

Places