- added bashcompdir patch; always pass bashcomp_dir for bash-completion >= 2.0 even...

diff --git a/createrepo_c-bashcompdir.patch b/createrepo_c-bashcompdir.patch
new file mode 100644 (file)
index 0000000..8c42a13
--- /dev/null
+++ b/createrepo_c-bashcompdir.patch
@@ -0,0 +1,34 @@
+--- /home/users/qboosh/rpm/BUILD/createrepo_c-0.10.0/CMakeLists.txt.orig       2018-05-11 22:44:34.072652081 +0200
++++ /home/users/qboosh/rpm/BUILD/createrepo_c-0.10.0/CMakeLists.txt    2018-05-12 08:30:25.683823187 +0200
+@@ -98,21 +98,25 @@
+ 
+ # Other files
+ 
++if (NOT BASHCOMP_DIR)
+ pkg_check_modules(BASHCOMP bash-completion)
+ if (BASHCOMP_FOUND)
+     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+-    message("Bash completion directory: ${BASHCOMP_DIR}")
++ELSE (BASHCOMP_FOUND)
++    set(BASHCOMP_DIR "/etc/bash_completion.d")
++endif (BASHCOMP_FOUND)
++endif (NOT BASHCOMP_DIR)
++message("Bash completion directory: ${BASHCOMP_DIR}")
++if (BASHCOMP_DIR STREQUAL "/etc/bash_completion.d")
++    INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR})
++else (BASHCOMP_DIR STREQUAL "/etc/bash_completion.d")
+     INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
+     INSTALL(CODE "
+         execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink createrepo_c \$ENV{DESTDIR}${BASHCOMP_DIR}/mergerepo_c)
+         execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink createrepo_c \$ENV{DESTDIR}${BASHCOMP_DIR}/modifyrepo_c)
+         execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink createrepo_c \$ENV{DESTDIR}${BASHCOMP_DIR}/sqliterepo_c)
+         ")
+-ELSE (BASHCOMP_FOUND)
+-    INSTALL(FILES createrepo_c.bash DESTINATION "/etc/bash_completion.d")
+-    message("Bash completion directory: /etc/bash_completion.d")
+-endif (BASHCOMP_FOUND)
+-
++endif (BASHCOMP_DIR STREQUAL "/etc/bash_completion.d")
+ 
+ # Gen manpage
+ 

diff --git a/createrepo_c.spec b/createrepo_c.spec
index 7eb5fd1f0018850debeb5d3c9d6aa4ab4a291174..3d628e7ad65e35847daf586546998ade8fe08b24 100644 (file)
--- a/createrepo_c.spec
+++ b/createrepo_c.spec
@@ -17,6 +17,7 @@ Source0:      https://github.com/rpm-software-management/createrepo_c/archive/%{versi
 Patch0:                %{name}-rpm5.patch
 Patch1:                %{name}-python.patch
 Patch2:                %{name}-include.patch
+Patch3:                %{name}-bashcompdir.patch
 URL:           https://github.com/rpm-software-management/createrepo_c
 BuildRequires: bzip2-devel
 BuildRequires: check-devel
@@ -130,7 +131,7 @@ Summary:    Bash completion for createrepo_c commands
 Summary(pl.UTF-8):     Bashowe uzupełnianie dla poleceń createrepo_c
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
-Requires:      bash-completion
+Requires:      bash-completion >= 2.0
 
 %description -n bash-completion-createrepo_c
 Bash completion for createrepo_c commands (createrepo_c, mergerepo_c,
@@ -150,7 +151,8 @@ mergerepo_c, modifyrepo_c).
 install -d build %{?with_python3:build-py3}
 
 cd build
-%cmake ..
+%cmake .. \
+       -DBASHCOMP_DIR=%{bashcomp_dir}
 
 %{__make}
 %{__make} doc
@@ -165,6 +167,7 @@ cd ..
 %if %{with python3}
 cd build-py3
 %cmake .. \
+       -DBASHCOMP_DIR=%{bashcomp_dir} \
        -DPYTHON_DESIRED=3
 
 %{__make}
@@ -244,4 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-createrepo_c
 %defattr(644,root,root,755)
-/etc/bash_completion.d/createrepo_c.bash
+%{bash_compdir}/createrepo_c
+%{bash_compdir}/mergerepo_c
+%{bash_compdir}/modifyrepo_c
+%{bash_compdir}/sqliterepo_c