Date: Monday, December 2, 2013 @ 15:36:40
Author: bgyorgy
Revision: 101873
upgpkg: ubuntu-sso-client 13.10-1
Update to version 13.10
Modified:
ubuntu-sso-client/trunk/PKGBUILD
Deleted:
ubuntu-sso-client/trunk/oauthlib-0.3.8.patch
----------------------+
PKGBUILD | 15 ++++-----------
oauthlib-0.3.8.patch | 40 ----------------------------------------
2 files changed, 4 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-02 14:36:24 UTC (rev 101872)
+++ PKGBUILD 2013-12-02 14:36:40 UTC (rev 101873)
@@ -2,8 +2,8 @@
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=ubuntu-sso-client
-pkgver=4.2.0
-pkgrel=3
+pkgver=13.10
+pkgrel=1
pkgdesc="Desktop service to allow applications to sign into Ubuntu services
via SSO"
arch=('any')
url="https://launchpad.net/ubuntu-sso-client";
@@ -10,12 +10,8 @@
license=('GPL')
depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2'
'python2-oauthlib' 'python2-pyopenssl' 'python2-pillow' 'twisted'
'gnome-keyring' 'gsettings-desktop-schemas')
makedepends=('python2-distutils-extra')
-replaces=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt')
-provides=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt')
-source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
- oauthlib-0.3.8.patch)
-md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
- '7eb0cf5ea1318ef5916b49f3c610aacd')
+source=(https://launchpad.net/$pkgname/stable-13-10/$pkgver/+download/$pkgname-$pkgver.tar.gz)
+md5sums=('2937163edb8ba06038fa0036c5c34c99')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -22,9 +18,6 @@
# Python2 fix
sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
- # Fix error with oautlib>=0.3.8
- patch -Np0 -i "$srcdir/oauthlib-0.3.8.patch"
}
build() {
Deleted: oauthlib-0.3.8.patch
===================================================================
--- oauthlib-0.3.8.patch 2013-12-02 14:36:24 UTC (rev 101872)
+++ oauthlib-0.3.8.patch 2013-12-02 14:36:40 UTC (rev 101873)
@@ -1,40 +0,0 @@
-=== modified file 'ubuntu_sso/utils/webclient/common.py'
---- ubuntu_sso/utils/webclient/common.py 2013-02-19 22:12:47 +0000
-+++ ubuntu_sso/utils/webclient/common.py 2013-04-12 20:11:22 +0000
-@@ -157,9 +157,12 @@
- else
SIGNATURE_TYPE_AUTH_HEADER),
- timestamp=str(timestamp))
-
-- url, signed_headers, body = oauth_client.sign(
-- uri, method, parameters if parameters is not None else {},
-- {'Content-Type': 'application/x-www-form-urlencoded'})
-+ try:
-+ url, signed_headers, body = oauth_client.sign(
-+ uri, method, parameters if parameters is not None else {},
-+ {'Content-Type': 'application/x-www-form-urlencoded'})
-+ except ValueError:
-+ url, signed_headers, body = oauth_client.sign(uri, method)
-
- return url, signed_headers, body
-
-
-=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
---- ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-02-19 22:12:47
+0000
-+++ ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-04-12 20:11:22
+0000
-@@ -794,15 +794,6 @@
-
- self.assert_headers_correct(signed_headers)
- self.assertEqual(url, self.sample_url)
-- if params is not None:
-- for param, value in params.items():
-- self.assertIn(param, body)
-- actual = body[param]
-- self.assertEqual(value, actual)
--
-- def test_build_oauth_request_with_params(self):
-- """Check that the oauth request are properly with params."""
-- self.test_build_oauth_request(params=self.sample_params)
-
- @defer.inlineCallbacks
- def test_build_signed_iri(self, params=None):
-
