summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-02-26 17:54:28 +0100
committerJan Pokorný <jpokorny@redhat.com>2015-02-26 22:41:14 +0100
commitfe8088478374eec1fe4d0c80e9577bb915b453d2 (patch)
treea1cffe5f752f5609b55811950987cf43a97cfc6f
parent6895e6abfaf78f23f94e2ecf2669c5e94882c743 (diff)
downloadclufter-fe8088478374eec1fe4d0c80e9577bb915b453d2.tar.gz
clufter-fe8088478374eec1fe4d0c80e9577bb915b453d2.tar.xz
clufter-fe8088478374eec1fe4d0c80e9577bb915b453d2.zip
clufter.spec: do not call rpm from withing rpmbuild
Reported by Mamoru Tasaka: <https://bugzilla.redhat.com/show_bug.cgi?id=1180723#c23> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--misc/clufter.spec13
1 files changed, 10 insertions, 3 deletions
diff --git a/misc/clufter.spec b/misc/clufter.spec
index d0ff4a0..a0041a1 100644
--- a/misc/clufter.spec
+++ b/misc/clufter.spec
@@ -231,9 +231,16 @@ ln -s '%{clufter_bashcompreal}' "%{buildroot}${bashcomp}"
%else
%{__install} -D -pm 644 -- .bashcomp "%{buildroot}${bashcomp}"
%endif
-# own %%%%{_datadir}/bash-completion in case of ...bash-completion/completions
-rpm -qf -- "$(dirname "${bashcompdir}")" | grep -q -- bash-completion \
- && bashcompdir="$(dirname "${bashcompdir}")" || :
+# own %%%%{_datadir}/bash-completion in case of ...bash-completion/completions,
+# more generally any path up to any of /, /usr, /usr/share, /etc
+while true; do
+ test "$(dirname "${bashcompdir}")" != "/" \
+ && test "$(dirname "${bashcompdir}")" != "%{_prefix}" \
+ && test "$(dirname "${bashcompdir}")" != "%{_datadir}" \
+ && test "$(dirname "${bashcompdir}")" != "%{_sysconfdir}" \
+ || break
+ bashcompdir="$(dirname "${bashcompdir}")"
+done
cat >.bashcomp-files <<-EOF
${bashcompdir}
%if %{with bashcomplink}