commit cea1843884f2e835cc1fdd1077449080de297210

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1229

dtb-aarch64.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

dtb-aarch64.spec

@@ -31,7 +31,7 @@
 Name:           dtb-aarch64
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif

dtb-armv6l.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

dtb-armv6l.spec

@@ -31,7 +31,7 @@
 Name:           dtb-armv6l
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif

dtb-armv7l.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

dtb-armv7l.spec

@@ -31,7 +31,7 @@
 Name:           dtb-armv7l
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif

kernel-64kb.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-64kb.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
@@ -339,59 +339,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-binary.spec.in

@@ -197,59 +197,6 @@ BuildArch:      i686
 # These files are found in the kernel-source package:
 @NOSOURCE@
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-debug.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-debug.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %ifarch ppc64
 Provides:       kernel-kdump = 2.6.28
 Obsoletes:      kernel-kdump <= 2.6.28
@@ -347,59 +347,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-default.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-default.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %ifarch %ix86
 Provides:       kernel-smp = 2.6.17
 Obsoletes:      kernel-smp <= 2.6.17
@@ -391,59 +391,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-docs.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-docs.spec

@@ -33,7 +33,7 @@ License:        GPL-2.0
 Group:          Documentation/Man
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -63,7 +63,7 @@ BuildRequires:  texlive-zapfding
 %endif
 Url:            http://www.kernel.org/
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz

kernel-kvmsmall.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-kvmsmall.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
@@ -339,59 +339,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-lpae.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-lpae.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
@@ -339,59 +339,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-obs-build.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-obs-build.spec

@@ -45,7 +45,7 @@ BuildRequires:  util-linux
 %endif
 %endif
 %endif
-BuildRequires:  kernel%kernel_flavor-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+BuildRequires:  kernel%kernel_flavor-srchash-cea1843884f2e835cc1fdd1077449080de297210
 
 %if 0%{?rhel_version}
 BuildRequires:  kernel
@@ -66,7 +66,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif

kernel-obs-qa.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-obs-qa.spec

@@ -38,7 +38,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif

kernel-pae.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-pae.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %ifarch %ix86
 Provides:       kernel-bigsmp = 2.6.17
 Obsoletes:      kernel-bigsmp <= 2.6.17
@@ -361,59 +361,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-source.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-source.spec

@@ -32,7 +32,7 @@ License:        GPL-2.0
 Group:          Development/Sources
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -43,7 +43,7 @@ BuildRequires:  fdupes
 BuildRequires:  sed
 Requires(post): coreutils sed
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 Provides:       linux
 Provides:       multiversion(kernel)
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz

kernel-subpackage-spec

@@ -1,8 +1,6 @@
 %define rpm_kver %(rpm -q --qf '%%{VERSION}' %kernel_package_name)
 %define rpm_krel %(rpm -q --qf '%%{RELEASE}' %kernel_package_name)
 
-%define kernel_base_recommends %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\n]' %kernel_package_name | grep -v '^kernel-firmware' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
-
 # Force bzip2 instead of lzma compression to
 # 1) allow install on older dist versions, and
 # 2) decrease build times (bsc#962356)
@@ -18,6 +16,10 @@
 %define kernel_requires_preun  %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'preun,' | sed -e 's/.*,//' | tr '\\n' ' ')
 %define kernel_requires_post   %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'post,' | sed -e 's/.*,//' | tr '\\n' ' ')
 %define kernel_requires_postun %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'postun,' | sed -e 's/.*,//' | tr '\\n' ' ')
+%define kernel_base_provides %(rpm -q --queryformat '[%%{PROVIDENEVRS}\\n]' %kernel_package_name | sed -E 's/^%kernel_package_name(-srchash| =)/%name\\1/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\\n' ' )')
+%define kernel_base_obsoletes %(rpm -q --queryformat '[%%{OBSOLETENEVRS}\\n]' %kernel_package_name | sed -E 's/^%kernel_package_name(-srchash| =)/%name\\1/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\\n' ' )')
+%define kernel_base_conflicts %(rpm -q --queryformat '[%%{CONFLICTNEVRS}\\n]' %kernel_package_name | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\\n' ' )')
+%define kernel_base_recommends %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\\n]' %kernel_package_name | grep -v '^kernel-firmware' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\\n' ' )')
 
 %if ! %(expr 1 - 1)
 %if "%{kernel_requires}" != ""
@@ -36,9 +38,15 @@ Requires(post): %kernel_requires_post
 Requires(postun):%kernel_requires_postun
 %endif
 %endif
-Provides:       %(rpm -q --queryformat '[%%{PROVIDENEVRS}\n]' %kernel_package_name | sed -E 's/^%kernel_package_name(-srchash| =)/%name\1/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
+%if "%{kernel_base_provides}" != ""
-Obsoletes:      %(rpm -q --queryformat '[%%{OBSOLETENEVRS}\n]' %kernel_package_name | sed -E 's/^%kernel_package_name(-srchash| =)/%name\1/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
+Provides:     %{kernel_base_provides}
-Conflicts:      %(rpm -q --queryformat '[%%{CONFLICTNEVRS}\n]' %kernel_package_name | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
+%endif
+%if "%{kernel_base_obsoletes}" != ""
+Obsoletes:     %{kernel_base_obsoletes}
+%endif
+%if "%{kernel_base_conflicts}" != ""
+Conflicts:     %{kernel_base_conflicts}
+%endif
 %if "%{kernel_base_recommends}" != ""
 Recommends:     %{kernel_base_recommends}
 %endif

kernel-syms.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-syms.spec

@@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        5.4.12
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -52,7 +52,7 @@ Requires:       kernel-pae-devel = %version-%source_rel
 %endif
 Requires:       pesign-obs-integration
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 Provides:       multiversion(kernel)
 Source:         README.KSYMS
 Requires:       kernel-devel%variant = %version-%source_rel

kernel-vanilla.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-vanilla.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
@@ -339,59 +339,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

kernel-zfcpdump.changes

@@ -147,6 +147,12 @@ Tue Jan 14 13:46:17 CET 2020 - tiwai@suse.de
 - Revert "iwlwifi: mvm: fix scan config command size" (bsc#1160717).
 - commit cf0d366
 
+-------------------------------------------------------------------
+Mon Jan 13 21:16:42 CET 2020 - msuchanek@suse.de
+
+- rpm/kernel-binary.spec.in: Do not obsolete KMPs (boo#1126512).
+- commit cea1843
+
 -------------------------------------------------------------------
 Mon Jan 13 05:59:20 CET 2020 - jslaby@suse.cz
 
@@ -2027,6 +2033,19 @@ Sat Dec 21 12:09:26 CET 2019 - jslaby@suse.cz
   (bnc#1012628).
 - commit e5f8301
 
+-------------------------------------------------------------------
+Thu Dec 19 18:55:07 CET 2019 - mkubecek@suse.cz
+
+- rpm/kernel-subpackage-spec: fix kernel-default-base build
+  There were some issues with recent changes to subpackage dependencies handling:
+- a typo in %kernel_base_conflicts macro name
+- copy/pasted "Recommends:" instead of "Provides:", "Obsoletes:" and
+  "Conflicts:
+- missing escaping of backslashes in macro expansions
+  Fixes: f3b74b0ae86b ("rpm/kernel-subpackage-spec: Unify dependency handling.")
+  Fixes: 3fd22e219f77 ("rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959)")
+- commit 762fd66
+
 -------------------------------------------------------------------
 Wed Dec 18 19:34:30 CET 2019 - jslaby@suse.cz
 
@@ -2099,6 +2118,12 @@ Wed Dec 18 12:45:43 CET 2019 - jslaby@suse.cz
 - cpuidle: teo: Avoid using "early hits" incorrectly (git-fixes).
 - commit 43b8f65
 
+-------------------------------------------------------------------
+Wed Dec 18 12:14:01 CET 2019 - msuchanek@suse.de
+
+- rpm/kernel-subpackage-spec: Unify dependency handling.
+- commit f3b74b0
+
 -------------------------------------------------------------------
 Tue Dec 17 22:30:35 CET 2019 - jslaby@suse.cz
 

kernel-zfcpdump.spec

@@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.12
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g7f4459b
+Release:        <RELEASE>.gcea1843
 %else
 Release:        0
 %endif
@@ -172,10 +172,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-%build_flavor-base-srchash-cea1843884f2e835cc1fdd1077449080de297210
-Provides:       kernel-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       kernel-srchash-cea1843884f2e835cc1fdd1077449080de297210
 # END COMMON DEPS
-Provides:       %name-srchash-7f4459b392c62d09edf1eadafc4cf7d694eccce3
+Provides:       %name-srchash-cea1843884f2e835cc1fdd1077449080de297210
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
@@ -339,59 +339,6 @@ NoSource:       113
 NoSource:       120
 NoSource:       121
 
-# The following KMPs have been integrated into the kernel package,
-# grouped by the last product that contained them.
-# Usage: obsolete_kmp <basename> <upper bound of shipped versions>
-# Note that KMPs embed the version of the kernel built against, that's why
-# the _3 suffix for 2.6.x-based KMPs
-%define obsolete_kmp() Obsoletes: %1-kmp-%build_flavor <= %2 \
-Provides: %1-kmp = %2 \
-Provides: %1-kmp-%build_flavor = %2
-# sles10 / 10.3
-%obsolete_kmp iwlwifi 1.3.27_3
-%obsolete_kmp ipw3945 1.2.2_3
-# sled10 / 11.0
-%obsolete_kmp uvcvideo r200_3
-# sle11-ga
-%obsolete_kmp enic 0.0.1_3
-%obsolete_kmp fnic 1.0.0_3
-%obsolete_kmp brocade-bfa 1.1.0.2_3
-%obsolete_kmp kvm 78.2.6.30.1_3
-%obsolete_kmp perfmon 2_3
-%obsolete_kmp iwlagn-2-6-27 1.0_3
-%obsolete_kmp msi-wmi 1.0_3
-# 11.1
-%obsolete_kmp quickcam 0.6.7
-# sle11-sp1
-%obsolete_kmp   wacom 0.8.1_3
-%obsolete_kmp   btrfs 0_3
-%obsolete_kmp   brocade-bna 2.1.0.0_3
-%obsolete_kmp   hyper-v 0_3
-%obsolete_kmp   intel-e1000e 2.2.14
-Obsoletes:      firewire <= 3.0
-Provides:       firewire = 3.0
-%obsolete_kmp   firewire 3.0
-%obsolete_kmp   iwlagn 3.0
-Obsoletes:      compat-ath9k <= 3.0
-Provides:       compat-ath9k = 3.0
-%obsolete_kmp   compat-ath9k 3.0
-%obsolete_kmp   realtek-r8192ce_pci 2.6.0005_3
-%obsolete_kmp   realtek-r8192se_pci 2.6.0019.1207.2010_3
-%obsolete_kmp   rt3090 2.4.0.4_3
-%obsolete_kmp   rt3592 2.4.1.1_3
-%obsolete_kmp   rt5390 2.4.0.4_3
-%obsolete_kmp   ath3k 1.0_3
-%obsolete_kmp	compat-wireless 3.12
-%obsolete_kmp	rts5229 1.08
-%obsolete_kmp	rts_pstor 1.11
-# sle12-sp1 / Leap 42.1
-%obsolete_kmp	xen 4.6.1
-%obsolete_kmp	compat-wireless 4.4
-# TW 4.8
-%obsolete_kmp	ftsteutates 20160601
-# SLE12-SP3 / Leap 42.3
-%obsolete_kmp   drm 4.12
-
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 

source-timestamp

@@ -1,3 +1,3 @@
-2020-01-15 09:29:49 +0000
+2020-01-16 08:38:59 +0000
-GIT Revision: 7f4459b392c62d09edf1eadafc4cf7d694eccce3
+GIT Revision: cea1843884f2e835cc1fdd1077449080de297210
 GIT Branch: stable