Author: kiesiu Date: Wed Jun 6 11:22:42 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.5.1 - patch for PLD ca-certificates location
---- Files affected: packages/bzr: bzr.spec (1.77 -> 1.78) , ca-certificates.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/bzr/bzr.spec diff -u packages/bzr/bzr.spec:1.77 packages/bzr/bzr.spec:1.78 --- packages/bzr/bzr.spec:1.77 Tue Mar 6 13:02:01 2012 +++ packages/bzr/bzr.spec Wed Jun 6 13:22:37 2012 @@ -2,13 +2,14 @@ Summary: Bazaar - a distributed revision control system Summary(pl.UTF-8): Bazaar - rozproszony system kontroli wersji Name: bzr -Version: 2.5.0 +Version: 2.5.1 Release: 1 License: GPL v2+ Group: Development/Version Control Source0: http://launchpad.net/bzr/2.5/%{version}/+download/%{name}-%{version}.tar.gz -# Source0-md5: 44eb47b77995098a28f017e2daa606b6 +# Source0-md5: ac5079858364a046071000d5cdccb67b Patch0: locale-path.patch +Patch1: ca-certificates.patch URL: http://bazaar.canonical.com/ BuildRequires: python >= 1:2.6 BuildRequires: python-devel @@ -77,6 +78,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # move out of contrib, as we package contrib as doc mv contrib/bash/bzr bash_completion.sh @@ -150,6 +152,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.78 2012/06/06 11:22:37 kiesiu +- updated to 2.5.1 +- patch for PLD ca-certificates location + Revision 1.77 2012/03/06 12:02:01 kiesiu - sco locale is not supported by current glibc ================================================================ Index: packages/bzr/ca-certificates.patch diff -u /dev/null packages/bzr/ca-certificates.patch:1.1 --- /dev/null Wed Jun 6 13:22:42 2012 +++ packages/bzr/ca-certificates.patch Wed Jun 6 13:22:37 2012 @@ -0,0 +1,11 @@ +diff -uNr bzr-2.5.1.old/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.5.1/bzrlib/transport/http/_urllib2_wrappers.py +--- bzr-2.5.1.old/bzrlib/transport/http/_urllib2_wrappers.py 2012-05-22 17:10:04.000000000 +0200 ++++ bzr-2.5.1/bzrlib/transport/http/_urllib2_wrappers.py 2012-06-06 12:44:17.028256769 +0200 +@@ -85,6 +85,7 @@ + u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD + # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 + u'/etc/openssl/certs/ca-certificates.crt', # Solaris ++ u'/etc/certs/ca-certificates.crt', # PLD Linux + ] + def default_ca_certs(): + if sys.platform == 'win32': ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/bzr/bzr.spec?r1=1.77&r2=1.78 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
