From dc345e6d162c49bd2d54f4d86a02de0731ff25ad Mon Sep 17 00:00:00 2001 From: Luis Bazan Date: Nov 21 2017 19:05:54 +0000 Subject: bash completition --- diff --git a/eg.spec b/eg.spec index 3cc120c..98d2e57 100644 --- a/eg.spec +++ b/eg.spec @@ -1,6 +1,6 @@ Name: eg Version: 1.7.5.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Git for mere mortals Group: Development/Tools License: GPLv2 @@ -12,7 +12,8 @@ Patch0: eg-1.7.5.2-fix-use-false-detection.patch # cd eg # git archive --format=tar --prefix=eg-1.7.5.2/ v1.7.5.2 | gzip > eg-1.7.5.2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl-generators +BuildRequires: bash-completion +BuildRequires: perl-generators Requires: perl-interpreter Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch @@ -42,20 +43,30 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ install -m 755 eg $RPM_BUILD_ROOT/%{_bindir}/ -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/ -install -m 644 bash-completion-eg.sh \ - $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/eg +bashcompdir=$(pkg-config --variable=completionsdir bash-completion || :) + install -m 644 bash-completion-eg.sh \ + if [ "$bashcompdir" ]; then + $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/eg + install -Dpm 644 bash-completion-eg.sh $RPM_BUILD_ROOT$bashcompdir/eg + echo %{_datadir}/bash-completion > %{name}.files + else + install -Dpm 644 bash-completion-eg.sh \ + $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/eg + echo %{_sysconfdir}/bash_completion.d > %{name}.files + fi %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.files %defattr(-,root,root,-) %doc README %{_bindir}/eg -%{_sysconfdir}/bash_completion.d %changelog +* Tue Nov 21 2017 Ville Skyttä - 1.7.5.2-18 +- Install bash completion to where bash-completion.pc says + * Wed Jul 26 2017 Fedora Release Engineering - 1.7.5.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild