Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-04-12 12:02:52 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-04-12 12:02:52 +0200
commit413b4beb10c722f37563d4707a3430a2b36c8587 (patch)
tree54740cf11bac313d15de651d21ffe2441888c14a
parentdb5dbaeb75d699c3bdb21238361bbf52e462d02b (diff)
parent0e54e61a47a4187e94ce4edb5003cdda52be865f (diff)
Merge branch 'packaging' into linux-next
-rw-r--r--rpm/kernel-subpackage-spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/rpm/kernel-subpackage-spec b/rpm/kernel-subpackage-spec
index 4501aeb6aa..485dc6ebc5 100644
--- a/rpm/kernel-subpackage-spec
+++ b/rpm/kernel-subpackage-spec
@@ -34,10 +34,10 @@ 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' | tr '\n' ' ')
-Conflicts: %(rpm -q --queryformat '[%%{CONFLICTNEVRS}\n]' %kernel_package_name | grep -vE '^ksym|^kmod' | tr '\n' ' ')
-Obsoletes: %(rpm -q --queryformat '[%%{OBSOLETENEVRS}\n]' %kernel_package_name | grep -vE '^ksym|^kmod' | tr '\n' ' ')
-Recommends: %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\n]' %kernel_package_name | grep -vE '^ksym|^kmod' | 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' ' )')
+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)