[bzr/f21] Fix locale files' install path (patch by tkuratom).

[Ondrej Oprala]

commit d19a454937d43a9b1e7c131beee0be7602ee6a57
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Tue Jul 29 19:23:50 2014 +0200

    Fix locale files' install path (patch by tkuratom).

 bzr-locale-location.patch |   12 ++++++++++++
 bzr.spec                  |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/bzr-locale-location.patch b/bzr-locale-location.patch
new file mode 100644
index 0000000..da9d7ac
--- /dev/null
+++ b/bzr-locale-location.patch
@@ -0,0 +1,12 @@
+diff -up bzr-2.6.0/setup.py.bak bzr-2.6.0/setup.py
+--- bzr-2.6.0/setup.py.bak	2014-07-29 10:12:47.521709038 -0700
++++ bzr-2.6.0/setup.py	2014-07-29 10:13:06.278800173 -0700
+@@ -76,7 +76,7 @@ PKG_DATA = {# install files from selftes
+ I18N_FILES = []
+ for filepath in glob.glob("bzrlib/locale/*/LC_MESSAGES/*.mo"):
+     langfile = filepath[len("bzrlib/locale/"):]
+-    targetpath = os.path.dirname(os.path.join("share/locale", langfile))
++    targetpath = os.path.dirname(os.path.join("locale", langfile))
+     I18N_FILES.append((targetpath, [filepath]))
+ 
+ def get_bzrlib_packages():
diff --git a/bzr.spec b/bzr.spec
index baf6a08..43f8a70 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -18,7 +18,7 @@
 %global bzrmajor 2.6
 %global bzrminor .0
 #global bzrrc b6
-%global release 4
+%global release 5
 
 Name:           bzr
 Version:        %{bzrmajor}%{?bzrminor}
@@ -48,6 +48,7 @@ Requires:   python-pycurl
 BuildRequires:   python-elementtree
 Requires:   python-elementtree
 %endif
+Patch0:         bzr-locale-location.patch
 
 %description
 Bazaar is a distributed revision control system that is powerful, friendly,
@@ -67,6 +68,7 @@ This package contains the documentation for the Bazaar version control system.
 
 %prep
 %setup -q -n %{name}-%{version}%{?bzrrc}
+%patch0 -p1
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -159,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_pkgdocdir}/contrib/
 
 %changelog
+* Tue Jul 29 2014 Ondrej Oprala <ooprala at redhat.com> - 2.6.0-5
+- Fix locale files' install path (patch by tkuratom).
+
 * Fri Jun 27 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.6.0-4
 - Let bzr and bsr-doc own %%{_pkgdocdir} (RHBZ #1113236).
 - Fix bogus %%changelog timestamps.