bzr: Fix ssl certification location for MSYS2. Fix bash-completion location.

bzr/0001-setup.py-man-install.patch

@@ -0,0 +1,26 @@
+From 86aa7e1525d061f6933a8a59ec1cd8b278c69e59 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aalto@cante.net>
+Date: Fri, 13 Sep 2013 21:10:11 +0300
+Subject: [PATCH] setup.py man instal
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto <jari.aalto@cante.net>
+---
+ setup.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index a21ebe8..8a9a501 100755
+--- a/setup.py
++++ b/setup.py
+@@ -762,7 +762,7 @@ def build_executable(self, *args, **kwargs):
+     if not 'bdist_egg' in sys.argv:
+         # generate and install bzr.1 only with plain install, not the
+         # easy_install one
+-        DATA_FILES = [('man/man1', ['bzr.1'])]
++        DATA_FILES = [('share/man/man1', ['bzr.1'])]
+ 
+     DATA_FILES = DATA_FILES + I18N_FILES
+     # std setup

bzr/0002-add-msys2-certs-location.patch

@@ -0,0 +1,10 @@
+--- bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py.orig	2014-12-14 01:00:15.240200000 +0300
++++ bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py	2014-12-14 01:02:20.621800000 +0300
+@@ -79,6 +79,7 @@
+ # Note for packagers: if there is no package providing certs for your platform,
+ # the curl project produces http://curl.haxx.se/ca/cacert.pem weekly.
+ _ssl_ca_certs_known_locations = [
++    u'/usr/ssl/certs/ca-bundle.crt', # MSYS2
+     u'/etc/ssl/certs/ca-certificates.crt', # Ubuntu/debian/gentoo
+     u'/etc/pki/tls/certs/ca-bundle.crt', # Fedora/CentOS/RH
+     u'/etc/ssl/ca-bundle.pem', # OpenSuse

bzr/PKGBUILD

@@ -2,21 +2,26 @@
 
 pkgname=bzr
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Bazaar is a version control system that helps you track project history over time and to collaborate easily with others."
 arch=('i686' 'x86_64')
 url="http://bazaar.canonical.com/en/"
 license=('GPL')
 groups=('VCS')
 depends=('python2')
-optdepends=('python-paramiko: for sftp support')
-source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
+#optdepends=('python-paramiko: for sftp support')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}
+        0001-setup.py-man-install.patch
+        0002-add-msys2-certs-location.patch)
 md5sums=('28c86653d0df10d202c6b842deb0ea35'
-         'SKIP')
+         'SKIP'
+         'a57fd2fba54576244e4a70c0b0ca77a5'
+         'b1c1a224402e393899a2953ca4b2375b')
 
 prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|man/man1|share/man/man1|' setup.py
+  patch -p1 -i ${srcdir}/0001-setup.py-man-install.patch
+  patch -p1 -i ${srcdir}/0002-add-msys2-certs-location.patch
   sed -e 's|/usr/bin/env python|/usr/bin/env python2|' \
       -i bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py} 
 }
@@ -31,5 +36,5 @@ package() {
   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   # bash-completion
-  install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr"
+  install -D -m644 contrib/bash/bzr "${pkgdir}/usr/share/bash-completion/completions/bzr"
 }