From bdc305a067fa401879a4224fb90b4bdba9c0b213 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Jan 27 2015 19:34:11 +0000
Subject: Install bash completion to %{_datadir}/bash-completion/completions


https://bugzilla.redhat.com/show_bug.cgi?id=1185579

---

diff --git a/bzr.spec b/bzr.spec
index a3dba60..d42e637 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -18,7 +18,7 @@
 %global bzrmajor 2.6
 %global bzrminor .0
 #global bzrrc b6
-%global release 6
+%global release 7
 
 Name:           bzr
 Version:        %{bzrmajor}%{?bzrminor}
@@ -33,7 +33,7 @@ Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+d
 Source2:        bzr-icon-64.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python2-devel zlib-devel
+BuildRequires:  python2-devel zlib-devel bash-completion
 # For building documents
 BuildRequires:  python-sphinx
 BuildRequires:  gettext
@@ -98,8 +98,8 @@ chmod 0644 contrib/bzr_ssh_path_limiter
 chmod 0644 contrib/bzr_access
 chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/*.so
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
-install -m 0644 contrib/bash/bzr $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
+bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
+install -Dpm 0644 contrib/bash/bzr $RPM_BUILD_ROOT$bashcompdir/bzr
 rm contrib/bash/bzr
 
 # This is included in %doc, remove redundancy here
@@ -144,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/bzr
 %{_mandir}/man1/*
 %{python_sitearch}/bzrlib/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/bash-completion/
 %{_datadir}/pixmaps/bzr.png
 %if 0%{?fedora} || 0%{?rhel} > 5
 %{python_sitearch}/*.egg-info
@@ -161,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_pkgdocdir}/contrib/
 
 %changelog
+* Sat Jan 24 2015 Ville Skyttä <ville.skytta@iki.fi> - 2.6-7
+- Install bash completion to %%{_datadir}/bash-completion/completions
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild