From dd553ee2c43ff409b514505368b7b692b31dd4d3 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Dec 23 2022 17:50:31 +0000 Subject: Drop adb bash completion on el8 to avoid conflict --- diff --git a/android-tools.spec b/android-tools.spec index f7a05f8..833f443 100644 --- a/android-tools.spec +++ b/android-tools.spec @@ -101,6 +101,11 @@ install -p -D -m 0644 %{SOURCE2} \ %{buildroot}%{_unitdir}/adb.service install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb +%if 0%{?el8} +# On el8 this is provided by the bash-completion package +rm %{buildroot}%{_datadir}/bash-completion/completions/adb +%endif + %post %systemd_post adb.service @@ -141,7 +146,9 @@ install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb %{_datadir}/android-tools/completions/fastboot %{_datadir}/android-tools/mkbootimg/gki/generate_gki_certificate.py %{_datadir}/android-tools/mkbootimg/mkbootimg.py +%if 0%{?fedora} || 0%{?rhel} > 8 %{_datadir}/bash-completion/completions/adb +%endif %{_datadir}/bash-completion/completions/fastboot %changelog