always provide bootctl in completion packages to keep them noarch; rel 2

diff --git a/systemd-completion.patch b/systemd-completion.patch
new file mode 100644 (file)
index 0000000..da35d03
--- /dev/null
+++ b/systemd-completion.patch
@@ -0,0 +1,24 @@
+diff -urN systemd-241.orig/shell-completion/bash/meson.build systemd-241/shell-completion/bash/meson.build
+--- systemd-241.orig/shell-completion/bash/meson.build 2019-02-14 11:11:58.000000000 +0100
++++ systemd-241/shell-completion/bash/meson.build      2019-03-07 01:08:55.312337719 +0100
+@@ -30,7 +30,7 @@
+                  ['udevadm',             ''],
+                  ['kernel-install',      ''],
+                  [bash_systemctl,        ''],
+-                 ['bootctl',             'ENABLE_EFI'],
++                 ['bootctl',             ''],
+                  ['coredumpctl',         'ENABLE_COREDUMP'],
+                  ['hostnamectl',         'ENABLE_HOSTNAMED'],
+                  ['localectl',           'ENABLE_LOCALED'],
+diff -urN systemd-241.orig/shell-completion/zsh/meson.build systemd-241/shell-completion/zsh/meson.build
+--- systemd-241.orig/shell-completion/zsh/meson.build  2019-02-14 11:11:58.000000000 +0100
++++ systemd-241/shell-completion/zsh/meson.build       2019-03-07 01:09:00.655641470 +0100
+@@ -25,7 +25,7 @@
+                  ['_sd_unit_files',            ''],
+                  ['_sd_machines',              ''],
+                  [zsh_systemctl,               ''],
+-                 ['_bootctl',                  'ENABLE_EFI'],
++                 ['_bootctl',                  ''],
+                  ['_coredumpctl',              'ENABLE_COREDUMP'],
+                  ['_hostnamectl',              'ENABLE_HOSTNAMED'],
+                  ['_localectl',                'ENABLE_LOCALED'],

diff --git a/systemd.spec b/systemd.spec
index 132988136830746c587bf7ac1818a801e376e2a7..f348719fd9e029f0e5a3a8d4cb19ff5bacb89c2b 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -29,7 +29,7 @@ Summary(pl.UTF-8):    systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       241
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
@@ -68,6 +68,7 @@ Patch3:               tmpfiles-not-fatal.patch
 Patch4:                udev-ploop-rules.patch
 Patch5:                udevadm-in-sbin.patch
 Patch6:                net-rename-revert.patch
+Patch7:                %{name}-completion.patch
 Patch8:                proc-hidepid.patch
 Patch9:                %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
@@ -663,6 +664,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch5 -p1
 # rejected upstream (do not disable!)
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -1993,7 +1995,7 @@ fi
 
 %files -n bash-completion-systemd
 %defattr(644,root,root,755)
-%{?with_efi:%{bash_compdir}/bootctl}
+%{bash_compdir}/bootctl
 %{bash_compdir}/busctl
 %{bash_compdir}/coredumpctl
 %{bash_compdir}/hostnamectl
@@ -2020,7 +2022,7 @@ fi
 
 %files -n zsh-completion-systemd
 %defattr(644,root,root,755)
-%{?with_efi:%{zsh_compdir}/_bootctl}
+%{zsh_compdir}/_bootctl
 %{zsh_compdir}/_busctl
 %{zsh_compdir}/_coredumpctl
 %{zsh_compdir}/_hostnamectl