From 85f743ea6cb484aaaf1a77fe3748dc837901114404dea0b409d53d90d3b5f00d Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Thu, 20 Apr 2023 11:27:36 +0000 Subject: [PATCH] Accepting request 1080796 from home:dimstar:Factory - Only move bash-completion from /etc to /usr/share if this was not properly installed. There was an error that bash-completion-devel did not actually contain the .cmake file which in turn resulted in this package mis-installing despite the correct build deps. OBS-URL: https://build.opensuse.org/request/show/1080796 OBS-URL: https://build.opensuse.org/package/show/devel:languages:D/ldc?expand=0&rev=62 --- ldc.changes | 9 +++++++++ ldc.spec | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ldc.changes b/ldc.changes index 7a6e12b..15c0e17 100644 --- a/ldc.changes +++ b/ldc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 20 10:28:50 UTC 2023 - Dominique Leuenberger + +- Only move bash-completion from /etc to /usr/share if this was not + properly installed. There was an error that + bash-completion-devel did not actually contain the .cmake file + which in turn resulted in this package mis-installing despite the + correct build deps. + ------------------------------------------------------------------- Tue Apr 11 12:23:35 UTC 2023 - Guillaume GARDET diff --git a/ldc.spec b/ldc.spec index 05d1784..56b5213 100644 --- a/ldc.spec +++ b/ldc.spec @@ -234,9 +234,11 @@ popd %install %cmake_install # Install bash completion in the right folder -install -d %{buildroot}%{_bashcompletionsdir} -mv %{buildroot}%{_sysconfdir}/bash_completion.d/ldc2 %{buildroot}%{_bashcompletionsdir} -rmdir %{buildroot}%{_sysconfdir}/bash_completion.d/ +if [ ! -d %{buildroot}%{_bashcompletionsdir} ]; then + install -d %{buildroot}%{_bashcompletionsdir} + mv %{buildroot}%{_sysconfdir}/bash_completion.d/ldc2 %{buildroot}%{_bashcompletionsdir} + rmdir %{buildroot}%{_sysconfdir}/bash_completion.d/ +fi # Make sure it can find its own libs (help2man runs the binaries) export LD_LIBRARY_PATH="$PWD/build/%_lib" # Build man pages