From 8c274f198937594771ce3a3453176ca8cb5efb58 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 8 Jan 2020 10:23:14 -0500 Subject: [PATCH] kernel.spec: Remove kernel-keys directory on rpm erase An empty /usr/share/doc/kernel-keys/VR directory is left after executing an 'rpm -e kernel-core-VR'. Simplify the code by removing the if clauses and only list the kernel-keys directory. Remove the directory when the rpm is erased. Signed-off-by: Bruno E. O. Meneguele Signed-off-by: Prarit Bhargava --- kernel.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel.spec b/kernel.spec index 5fe0a1f7f..533bb1c3f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2840,12 +2840,7 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\ -%ifarch s390x ppc64le\ -%if 0%{!?4:1}\ -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/%{signing_key_filename} \ -%endif\ -%endif\ +%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ %endif\