File project.diff of Package kernel-sunxi

--- dtb-aarch64.spec.orig
+++ dtb-aarch64.spec
@@ -396,15 +396,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 .
@@ -606,6 +603,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-allwinner -f dtb-allwinner.list
 %else
+
 %files -n dtb-allwinner
 %endif
 %defattr(-,root,root)
@@ -617,6 +615,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-altera -f dtb-altera.list
 %else
+
 %files -n dtb-altera
 %endif
 %defattr(-,root,root)
@@ -628,6 +627,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-amazon -f dtb-amazon.list
 %else
+
 %files -n dtb-amazon
 %endif
 %defattr(-,root,root)
@@ -639,6 +639,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-amd -f dtb-amd.list
 %else
+
 %files -n dtb-amd
 %endif
 %defattr(-,root,root)
@@ -650,6 +651,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-amlogic -f dtb-amlogic.list
 %else
+
 %files -n dtb-amlogic
 %endif
 %defattr(-,root,root)
@@ -661,6 +663,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-apm -f dtb-apm.list
 %else
+
 %files -n dtb-apm
 %endif
 %defattr(-,root,root)
@@ -672,6 +675,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-apple -f dtb-apple.list
 %else
+
 %files -n dtb-apple
 %endif
 %defattr(-,root,root)
@@ -683,6 +687,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-arm -f dtb-arm.list
 %else
+
 %files -n dtb-arm
 %endif
 %defattr(-,root,root)
@@ -694,6 +699,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-broadcom -f dtb-broadcom.list
 %else
+
 %files -n dtb-broadcom
 %endif
 %defattr(-,root,root)
@@ -705,6 +711,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-cavium -f dtb-cavium.list
 %else
+
 %files -n dtb-cavium
 %endif
 %defattr(-,root,root)
@@ -716,6 +723,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-exynos -f dtb-exynos.list
 %else
+
 %files -n dtb-exynos
 %endif
 %defattr(-,root,root)
@@ -727,6 +735,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-freescale -f dtb-freescale.list
 %else
+
 %files -n dtb-freescale
 %endif
 %defattr(-,root,root)
@@ -738,6 +747,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-hisilicon -f dtb-hisilicon.list
 %else
+
 %files -n dtb-hisilicon
 %endif
 %defattr(-,root,root)
@@ -749,6 +759,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-lg -f dtb-lg.list
 %else
+
 %files -n dtb-lg
 %endif
 %defattr(-,root,root)
@@ -760,6 +771,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-marvell -f dtb-marvell.list
 %else
+
 %files -n dtb-marvell
 %endif
 %defattr(-,root,root)
@@ -771,6 +783,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-mediatek -f dtb-mediatek.list
 %else
+
 %files -n dtb-mediatek
 %endif
 %defattr(-,root,root)
@@ -782,6 +795,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-nvidia -f dtb-nvidia.list
 %else
+
 %files -n dtb-nvidia
 %endif
 %defattr(-,root,root)
@@ -793,6 +807,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-qcom -f dtb-qcom.list
 %else
+
 %files -n dtb-qcom
 %endif
 %defattr(-,root,root)
@@ -804,6 +819,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-renesas -f dtb-renesas.list
 %else
+
 %files -n dtb-renesas
 %endif
 %defattr(-,root,root)
@@ -815,6 +831,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-rockchip -f dtb-rockchip.list
 %else
+
 %files -n dtb-rockchip
 %endif
 %defattr(-,root,root)
@@ -826,6 +843,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-socionext -f dtb-socionext.list
 %else
+
 %files -n dtb-socionext
 %endif
 %defattr(-,root,root)
@@ -837,6 +855,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sprd -f dtb-sprd.list
 %else
+
 %files -n dtb-sprd
 %endif
 %defattr(-,root,root)
@@ -848,6 +867,7 @@ cd /boot
 %ifarch 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
@@ -192,15 +192,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 .
@@ -248,6 +245,7 @@ cd /boot
 %ifarch 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
@@ -572,15 +572,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 .
@@ -922,6 +919,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-am335x -f dtb-am335x.list
 %else
+
 %files -n dtb-am335x
 %endif
 %defattr(-,root,root)
@@ -932,6 +930,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-am3517 -f dtb-am3517.list
 %else
+
 %files -n dtb-am3517
 %endif
 %defattr(-,root,root)
@@ -942,6 +941,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-am57xx -f dtb-am57xx.list
 %else
+
 %files -n dtb-am57xx
 %endif
 %defattr(-,root,root)
@@ -952,6 +952,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-armada-370 -f dtb-armada-370.list
 %else
+
 %files -n dtb-armada-370
 %endif
 %defattr(-,root,root)
@@ -962,6 +963,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-armada-375 -f dtb-armada-375.list
 %else
+
 %files -n dtb-armada-375
 %endif
 %defattr(-,root,root)
@@ -972,6 +974,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-armada-385 -f dtb-armada-385.list
 %else
+
 %files -n dtb-armada-385
 %endif
 %defattr(-,root,root)
@@ -982,6 +985,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-armada-388 -f dtb-armada-388.list
 %else
+
 %files -n dtb-armada-388
 %endif
 %defattr(-,root,root)
@@ -992,6 +996,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-armada-398 -f dtb-armada-398.list
 %else
+
 %files -n dtb-armada-398
 %endif
 %defattr(-,root,root)
@@ -1002,6 +1007,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-armada-xp -f dtb-armada-xp.list
 %else
+
 %files -n dtb-armada-xp
 %endif
 %defattr(-,root,root)
@@ -1012,6 +1018,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-bcm2836 -f dtb-bcm2836.list
 %else
+
 %files -n dtb-bcm2836
 %endif
 %defattr(-,root,root)
@@ -1022,6 +1029,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-dove -f dtb-dove.list
 %else
+
 %files -n dtb-dove
 %endif
 %defattr(-,root,root)
@@ -1032,6 +1040,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-exynos4 -f dtb-exynos4.list
 %else
+
 %files -n dtb-exynos4
 %endif
 %defattr(-,root,root)
@@ -1042,6 +1051,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-exynos5 -f dtb-exynos5.list
 %else
+
 %files -n dtb-exynos5
 %endif
 %defattr(-,root,root)
@@ -1052,6 +1062,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-imx5 -f dtb-imx5.list
 %else
+
 %files -n dtb-imx5
 %endif
 %defattr(-,root,root)
@@ -1062,6 +1073,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-imx6 -f dtb-imx6.list
 %else
+
 %files -n dtb-imx6
 %endif
 %defattr(-,root,root)
@@ -1072,6 +1084,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-imx7 -f dtb-imx7.list
 %else
+
 %files -n dtb-imx7
 %endif
 %defattr(-,root,root)
@@ -1082,6 +1095,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-keystone -f dtb-keystone.list
 %else
+
 %files -n dtb-keystone
 %endif
 %defattr(-,root,root)
@@ -1092,6 +1106,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-meson6 -f dtb-meson6.list
 %else
+
 %files -n dtb-meson6
 %endif
 %defattr(-,root,root)
@@ -1102,6 +1117,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-meson8 -f dtb-meson8.list
 %else
+
 %files -n dtb-meson8
 %endif
 %defattr(-,root,root)
@@ -1112,6 +1128,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-meson8b -f dtb-meson8b.list
 %else
+
 %files -n dtb-meson8b
 %endif
 %defattr(-,root,root)
@@ -1122,6 +1139,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-mt76 -f dtb-mt76.list
 %else
+
 %files -n dtb-mt76
 %endif
 %defattr(-,root,root)
@@ -1132,6 +1150,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-omap3 -f dtb-omap3.list
 %else
+
 %files -n dtb-omap3
 %endif
 %defattr(-,root,root)
@@ -1142,6 +1161,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-omap4 -f dtb-omap4.list
 %else
+
 %files -n dtb-omap4
 %endif
 %defattr(-,root,root)
@@ -1152,6 +1172,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-omap5 -f dtb-omap5.list
 %else
+
 %files -n dtb-omap5
 %endif
 %defattr(-,root,root)
@@ -1162,6 +1183,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-qcom -f dtb-qcom.list
 %else
+
 %files -n dtb-qcom
 %endif
 %defattr(-,root,root)
@@ -1172,6 +1194,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-rk3 -f dtb-rk3.list
 %else
+
 %files -n dtb-rk3
 %endif
 %defattr(-,root,root)
@@ -1182,6 +1205,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-socfpga -f dtb-socfpga.list
 %else
+
 %files -n dtb-socfpga
 %endif
 %defattr(-,root,root)
@@ -1192,6 +1216,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-ste -f dtb-ste.list
 %else
+
 %files -n dtb-ste
 %endif
 %defattr(-,root,root)
@@ -1202,6 +1227,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sun4i -f dtb-sun4i.list
 %else
+
 %files -n dtb-sun4i
 %endif
 %defattr(-,root,root)
@@ -1212,6 +1238,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sun5i -f dtb-sun5i.list
 %else
+
 %files -n dtb-sun5i
 %endif
 %defattr(-,root,root)
@@ -1222,6 +1249,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sun6i -f dtb-sun6i.list
 %else
+
 %files -n dtb-sun6i
 %endif
 %defattr(-,root,root)
@@ -1232,6 +1260,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sun7i -f dtb-sun7i.list
 %else
+
 %files -n dtb-sun7i
 %endif
 %defattr(-,root,root)
@@ -1242,6 +1271,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sun8i -f dtb-sun8i.list
 %else
+
 %files -n dtb-sun8i
 %endif
 %defattr(-,root,root)
@@ -1252,6 +1282,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sun9i -f dtb-sun9i.list
 %else
+
 %files -n dtb-sun9i
 %endif
 %defattr(-,root,root)
@@ -1262,6 +1293,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-tegra2 -f dtb-tegra2.list
 %else
+
 %files -n dtb-tegra2
 %endif
 %defattr(-,root,root)
@@ -1272,6 +1304,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-tegra3 -f dtb-tegra3.list
 %else
+
 %files -n dtb-tegra3
 %endif
 %defattr(-,root,root)
@@ -1282,6 +1315,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-tegra114 -f dtb-tegra114.list
 %else
+
 %files -n dtb-tegra114
 %endif
 %defattr(-,root,root)
@@ -1292,6 +1326,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-tegra124 -f dtb-tegra124.list
 %else
+
 %files -n dtb-tegra124
 %endif
 %defattr(-,root,root)
@@ -1302,6 +1337,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-vexpress -f dtb-vexpress.list
 %else
+
 %files -n dtb-vexpress
 %endif
 %defattr(-,root,root)
@@ -1312,6 +1348,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-vf500 -f dtb-vf500.list
 %else
+
 %files -n dtb-vf500
 %endif
 %defattr(-,root,root)
@@ -1322,6 +1359,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-vf6 -f dtb-vf6.list
 %else
+
 %files -n dtb-vf6
 %endif
 %defattr(-,root,root)
@@ -1332,6 +1370,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-xenvm -f dtb-xenvm.list
 %else
+
 %files -n dtb-xenvm
 %endif
 %defattr(-,root,root)
@@ -1342,6 +1381,7 @@ cd /boot
 %ifarch 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
@@ -219,15 +219,12 @@ Requires(post): coreutils
 %description -n dtb-starfive
 Device Tree files for StarFive 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 .
@@ -296,6 +293,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-microchip -f dtb-microchip.list
 %else
+
 %files -n dtb-microchip
 %endif
 %defattr(-,root,root)
@@ -307,6 +305,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-renesas -f dtb-renesas.list
 %else
+
 %files -n dtb-renesas
 %endif
 %defattr(-,root,root)
@@ -318,6 +317,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-sifive -f dtb-sifive.list
 %else
+
 %files -n dtb-sifive
 %endif
 %defattr(-,root,root)
@@ -329,6 +329,7 @@ cd /boot
 %ifarch aarch64 riscv64
 %files -n dtb-starfive -f dtb-starfive.list
 %else
+
 %files -n dtb-starfive
 %endif
 %defattr(-,root,root)
--- kernel-64kb.spec.orig
+++ kernel-64kb.spec
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -430,6 +430,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" \
@@ -1234,6 +1235,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" \
@@ -1241,6 +1243,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" \
@@ -1248,6 +1251,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" \
@@ -1255,6 +1259,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" \
@@ -1262,21 +1267,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
 Requires(post): suse-module-tools
@@ -1361,6 +1367,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" \
@@ -1407,9 +1414,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
@@ -1547,6 +1554,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1563,6 +1571,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1574,11 +1583,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
@@ -1632,17 +1641,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
 
@@ -1658,9 +1668,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
@@ -1686,8 +1696,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
@@ -1741,8 +1751,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
@@ -1794,8 +1804,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
@@ -1847,8 +1857,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
@@ -1915,8 +1925,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
@@ -1969,8 +1979,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
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -436,6 +436,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" \
@@ -1240,6 +1241,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" \
@@ -1247,6 +1249,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" \
@@ -1254,6 +1257,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" \
@@ -1261,6 +1265,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" \
@@ -1268,21 +1273,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
 Requires(post): suse-module-tools
@@ -1369,6 +1375,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" \
@@ -1419,9 +1426,9 @@ Provides:       kernel-kdump-extra = 2.6
 Obsoletes:      kernel-kdump-extra <= 2.6.28
 %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
@@ -1559,6 +1566,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1575,6 +1583,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1586,11 +1595,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
@@ -1648,17 +1657,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
 
@@ -1674,9 +1684,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
@@ -1702,8 +1712,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
@@ -1757,8 +1767,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
@@ -1810,8 +1820,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
@@ -1863,8 +1873,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
@@ -1931,8 +1941,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
@@ -1985,8 +1995,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
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -479,6 +479,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" \
@@ -1283,6 +1284,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" \
@@ -1290,6 +1292,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" \
@@ -1297,6 +1300,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" \
@@ -1304,6 +1308,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" \
@@ -1311,21 +1316,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
 Requires(post): suse-module-tools
@@ -1431,6 +1437,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" \
@@ -1501,9 +1508,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
@@ -1659,6 +1666,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1675,6 +1683,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1686,11 +1695,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
@@ -1768,17 +1777,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
 
@@ -1794,9 +1804,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
@@ -1822,8 +1832,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
@@ -1877,8 +1887,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
@@ -1930,8 +1940,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
@@ -1983,8 +1993,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
@@ -2051,8 +2061,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
@@ -2105,8 +2115,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
@@ -50,17 +50,17 @@ BuildRequires:  graphviz
 BuildRequires:  graphviz-gd
 BuildRequires:  graphviz-gnome
 %if ! 0%{?suse_version} || 0%{?suse_version} > 1500
-BuildRequires:  python3-base
 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
@@ -68,8 +68,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
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -434,6 +434,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" \
@@ -1238,6 +1239,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" \
@@ -1245,6 +1247,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" \
@@ -1252,6 +1255,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" \
@@ -1259,6 +1263,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" \
@@ -1266,21 +1271,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
 Requires(post): suse-module-tools
@@ -1369,6 +1375,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" \
@@ -1415,9 +1422,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
@@ -1563,6 +1570,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1579,6 +1587,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1590,11 +1599,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
@@ -1648,17 +1657,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
 
@@ -1674,9 +1684,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
@@ -1702,8 +1712,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
@@ -1757,8 +1767,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
@@ -1810,8 +1820,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
@@ -1863,8 +1873,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
@@ -1931,8 +1941,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
@@ -1985,8 +1995,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
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -428,6 +428,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" \
@@ -1232,6 +1233,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" \
@@ -1239,6 +1241,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" \
@@ -1246,6 +1249,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" \
@@ -1253,6 +1257,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" \
@@ -1260,21 +1265,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
 Requires(post): suse-module-tools
@@ -1357,6 +1363,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" \
@@ -1403,9 +1410,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
@@ -1539,6 +1546,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1555,6 +1563,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1566,11 +1575,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
@@ -1624,17 +1633,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
 
@@ -1650,9 +1660,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
@@ -1678,8 +1688,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
@@ -1733,8 +1743,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
@@ -1786,8 +1796,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
@@ -1839,8 +1849,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
@@ -1907,8 +1917,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
@@ -1961,8 +1971,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
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -456,6 +456,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" \
@@ -1260,6 +1261,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" \
@@ -1267,6 +1269,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" \
@@ -1274,6 +1277,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" \
@@ -1281,6 +1285,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" \
@@ -1288,21 +1293,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
 Requires(post): suse-module-tools
@@ -1401,6 +1407,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" \
@@ -1457,9 +1464,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
@@ -1615,6 +1622,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1631,6 +1639,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1642,11 +1651,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
@@ -1710,17 +1719,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
 
@@ -1736,9 +1746,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
@@ -1764,8 +1774,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
@@ -1819,8 +1829,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
@@ -1872,8 +1882,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
@@ -1925,8 +1935,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
@@ -1993,8 +2003,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
@@ -2047,8 +2057,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
@@ -161,6 +161,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
@@ -177,8 +178,10 @@ external kernel modules.
 
 %source_timestamp
 
+
 # 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
@@ -216,6 +219,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
@@ -314,7 +318,6 @@ relink linux-%kernelrelease%variant /usr
 /usr/lib/rpm/kernel/*
 %endif
 
-
 %if %do_vanilla
 
 %files vanilla
--- kernel-syms.spec.orig
+++ kernel-syms.spec
@@ -74,6 +74,7 @@ package dependencies.
 
 
 %source_timestamp
+
 %prep
 
 %install
--- kernel-vanilla.spec.orig
+++ kernel-vanilla.spec
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -427,6 +427,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" \
@@ -1231,6 +1232,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" \
@@ -1238,6 +1240,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" \
@@ -1245,6 +1248,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" \
@@ -1252,6 +1256,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" \
@@ -1259,21 +1264,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
 Requires(post): suse-module-tools
@@ -1355,6 +1361,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" \
@@ -1401,9 +1408,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
@@ -1535,6 +1542,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1551,6 +1559,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1562,11 +1571,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
@@ -1620,17 +1629,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
 
@@ -1646,9 +1656,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
@@ -1674,8 +1684,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
@@ -1729,8 +1739,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
@@ -1782,8 +1792,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
@@ -1835,8 +1845,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
@@ -1903,8 +1913,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
@@ -1957,8 +1967,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
@@ -167,15 +167,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
 Requires(post): suse-module-tools
@@ -430,6 +430,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" \
@@ -1234,6 +1235,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" \
@@ -1241,6 +1243,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" \
@@ -1248,6 +1251,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" \
@@ -1255,6 +1259,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" \
@@ -1262,21 +1267,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
 Requires(post): suse-module-tools
@@ -1361,6 +1367,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" \
@@ -1407,9 +1414,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
@@ -1547,6 +1554,7 @@ kmsg message documentation comments.
 
 
 %source_timestamp
+
 %files man
 /usr/share/man/man9/*
 %endif
@@ -1563,6 +1571,7 @@ from this package.
 
 
 %source_timestamp
+
 %files vdso
 /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/
 %endif
@@ -1574,11 +1583,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
@@ -1632,17 +1641,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
 
@@ -1658,9 +1668,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
@@ -1686,8 +1696,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
@@ -1741,8 +1751,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
@@ -1794,8 +1804,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
@@ -1847,8 +1857,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
@@ -1915,8 +1925,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
@@ -1969,8 +1979,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
--- series.conf.orig
+++ series.conf
@@ -1844,3 +1844,68 @@
 	# You'd better have a good reason for adding a patch
 	# below here.
 	########################################################
+	patches.sunxi/0109-drm-panfrost-add-support-for-custom-soft-reset-on-GXM.patch
+	patches.sunxi/0110-drivers-net-wireless-brcmfmac-add-ap6330-firmware.patch
+	patches.sunxi/0500-clk-Implement-protected-clocks-for-all-OF-clock-prov.patch
+	patches.sunxi/0501-Revert-clk-qcom-Support-protected-clocks-property.patch
+	patches.sunxi/0502-arm64-dts-allwinner-h6-Protect-SCP-clock.patch
+	patches.sunxi/0503-rtc-sun6i-Allow-RTC-wakeup-after-shutdown.patch
+	patches.sunxi/0504-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
+	patches.sunxi/0505-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
+	patches.sunxi/0506-ASoC-hdmi-codec-fix-channel-allocation.patch
+	patches.sunxi/0507-ASoC-sun4i-i2s-WiP-multi-channel.patch
+	patches.sunxi/0508-arm64-dts-sun50i-h6-dtsi-add-sound-node.patch
+	patches.sunxi/0523-drm-sun4i-dw-hdmi-revert-Fix-ddc-en-GPIO-consumer.patch
+	patches.sunxi/0524-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
+	patches.sunxi/0531-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch
+	patches.sunxi/0534-media-cedrus-Don-t-CPU-map-source-buffers.patch
+	patches.sunxi/0548-media-cedrus-add-vc1-decoding-support.patch
+	patches.sunxi/0559-mfd-add-AC200.patch
+	patches.sunxi/0560-net-phy-Add-support-for-AC200-EPHY.patch
+	patches.sunxi/0561-arm64-dts-sun50i-h6.dtsi-add-ac200-nodes.patch
+	patches.sunxi/0562-arm64-dts-allwinner-gs1-fix-eMMC-and-incr-vcpu-limit.patch
+	patches.sunxi/0563-arm64-dts-allwinner-tanix-tx6-mini-enable-eth.patch
+	patches.sunxi/0564-arm64-dts-allwinner-add-Eeachlink-H6-Mini.patch
+	patches.sunxi/0565-arm64-dts-allwinner-tanix-tx6-mini-enable-wifi-cpu-dvfs.patch
+	patches.sunxi/0567-arm64-dts-enable-audio-gs1.patch
+	patches.sunxi/0568-arm64-dts-allwinner-tanix-tx6-enable-wifi-cpu-dvfs.patch
+	patches.sunxi/0569-drm-dw-hdmi-cec-sleep-100ms-on-error.patch
+	patches.sunxi/0573-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch
+	patches.sunxi/0574-drm-sun4i-mixer-Add-caching-support.patch
+	patches.sunxi/0575-H6-add-sun50i-di-deinterlace-WiP.patch
+	patches.sunxi/0576-arm64-dts-h6-add-deinterlace-node.patch
+	patches.sunxi/0577-net-wireless-add-xr819-support-07072021.patch
+	patches.sunxi/0579-drm-bridge-dw-hdmi-fix-4k60-modes-on-some-tv.patch
+	patches.sunxi/0580-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch
+	patches.sunxi/0581-net-stmmac-sun8i-Rename-PHY-regulator-variable-to-re.patch
+	patches.sunxi/0582-net-stmmac-sun8i-Add-support-for-enabling-a-regulato.patch
+	patches.sunxi/0583-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch
+	patches.sunxi/0584-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch
+	patches.sunxi/0585-arm64-dts-allwinner-OrangePi3-fixes.patch
+	patches.sunxi/0586-hantro-Add-quirk-for-NV12-NV12_4L4-capture-format.patch
+	patches.sunxi/0587-arm64-dts-allwinner-add-Tanix-TX6-A.patch
+	patches.sunxi/0588-arm64-dts-allwinner-enable-gpu-opp-multiple-boards.patch
+	patches.sunxi/0590-arm64-dts-allwinner-add-orangepi-3-lts.patch
+	patches.sunxi/0592-net-wireless-rtw88-misc-fixes-09072023.patch
+	patches.sunxi/0593-net-wireless-rtw88-misc-hacks-09072023.patch
+	patches.sunxi/0600-drivers-h616-wip-add-usb-emac2-support.patch
+	patches.sunxi/0601-drivers-thermal-allwinner-add-h616-ths-support.patch
+	patches.sunxi/0602-media-cedrus-add-H616-variant.patch
+	patches.sunxi/0603-soc-sunxi-sram-Add-SRAM-C1-H616-handling.patch
+	patches.sunxi/0606-dma-sun6i-dma-add-h616-support.patch
+	patches.sunxi/0607-drivers-drm-wip-add-h616-hdmi-xulong.patch
+	patches.sunxi/0608-sound-soc-sunxi-add-codec-driver-for-h616.patch
+	patches.sunxi/0609-sound-soc-add-sunxi_v2-for-h616-ahub.patch
+	patches.sunxi/0612-gpu-drm-panfrost-panfrost-devfreq-revert-set-opp-to-the-recommended.patch
+	patches.sunxi/0614-clk-sunxi-ng-ccu-sun6i-rtc-fix-32k-clk.patch
+	patches.sunxi/0615-drivers-iommu-sun50i-iommu-fix-iommu-on-h616.patch
+	patches.sunxi/0616-net-wireless-add-uwe5622-support-08042023.patch
+	patches.sunxi/0617-0608-sound-soc-sunxi-fix-no-Rch-and-slow-24bit.patch
+	patches.sunxi/0630-arm64-dts-allwinner-h616.dtsi-add-ths-audio-hdmi.patch
+	patches.sunxi/0631-arm64-dts-allwinner-h616-OrangePI-Zero2-enable-ths-hdmi-audio.patch
+	patches.sunxi/0632-arm64-dts-allwinner-h616-add-Tanix-TX6s-TVbox.patch
+	patches.sunxi/0633-arm64-dts-allwinner-h616-add-Tanix-TX6s-axp313-TVbox.patch
+	patches.sunxi/0634-arm64-dts-allwinner-h313-add-x96q-TVbox.patch
+	patches.sunxi/0635-arm64-dts-allwinner-h313-add-x96q-lpddr3-TVbox.patch
+	patches.sunxi/0636-arm64-dts-allwinner-h618-add-OrangePI-Zero3.patch
+	patches.sunxi/0637-arm64-dts-allwinner-h618-add-vontar-h618-TVbox.patch
\ No newline at end of file
openSUSE Build Service is sponsored by