Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-04-11 17:09:53 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-04-11 18:47:15 +0200
commit0e54e61a47a4187e94ce4edb5003cdda52be865f (patch)
treefad2aa8fe70fdb70604016548c7e9262cb00feee
parent839debd3bd73668075c3077ae5fa9da861a4a933 (diff)
Do not provide kernel-default from kernel-default-base (boo#1132154, bsc#1106751).
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-rw-r--r--rpm/kernel-subpackage-spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpm/kernel-subpackage-spec b/rpm/kernel-subpackage-spec
index aa6f2f0392..485dc6ebc5 100644
--- a/rpm/kernel-subpackage-spec
+++ b/rpm/kernel-subpackage-spec
@@ -34,9 +34,9 @@ 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-srchash/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
+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' ' )')
+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' ' )')
Conflicts: %(rpm -q --queryformat '[%%{CONFLICTNEVRS}\n]' %kernel_package_name | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
-Obsoletes: %(rpm -q --queryformat '[%%{OBSOLETENEVRS}\n]' %kernel_package_name | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
Recommends: %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\n]' %kernel_package_name | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )')
# This is in place of obsolete_rebuilds. This should give Conflicts: %%kernel_package_name = %%source_rel as old kernel-default-base did.
Conflicts: %(rpm -q --queryformat '[%%{PROVIDENEVRS}\n]' %kernel_package_name | grep '^%kernel_package_name =' | sort -V | head -n 1)