[arch-commits] Commit in ubuntu-sso-client/trunk (PKGBUILD oauthlib-0.3.8.patch)

2013-12-02 Thread Balló György 
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
===
--- PKGBUILD2013-12-02 14:36:24 UTC (rev 101872)
+++ PKGBUILD2013-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.patch2013-12-02 14:36:24 UTC (rev 101872)
+++ oauthlib-0.3.8.patch2013-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 +
-+++ ubuntu_sso/utils/webclient/common.py   2013-04-12 20:11:22 +
-@@ -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 
+
-+++ ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-04-12 20:11:22 
+
-@@ -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):
-

[arch-commits] Commit in ubuntu-sso-client/trunk (PKGBUILD)

2013-09-15 Thread Balló György 
Date: Sunday, September 15, 2013 @ 16:37:22
  Author: bgyorgy
Revision: 97233

upgpkg: ubuntu-sso-client 4.2.0-3

Rebuild for Pillow

Modified:
  ubuntu-sso-client/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-15 14:28:09 UTC (rev 97232)
+++ PKGBUILD2013-09-15 14:37:22 UTC (rev 97233)
@@ -3,12 +3,12 @@
 
 pkgname=ubuntu-sso-client
 pkgver=4.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Desktop service to allow applications to sign into Ubuntu services 
via SSO
 arch=('any')
 url=https://launchpad.net/ubuntu-sso-client;
 license=('GPL')
-depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 
'python2-oauthlib' 'python2-pyopenssl' 'python2-imaging' 'twisted' 
'gnome-keyring' 'gsettings-desktop-schemas')
+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')
@@ -17,7 +17,7 @@
 md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
  '7eb0cf5ea1318ef5916b49f3c610aacd')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
 
   # Python2 fix
@@ -25,14 +25,15 @@
 
   # Fix error with oautlib=0.3.8
   patch -Np0 -i $srcdir/oauthlib-0.3.8.patch
+}
 
+build() {
+  cd $srcdir/$pkgname-$pkgver
   python2 setup.py build
 }
 
 package() {
-
   cd $srcdir/$pkgname-$pkgver
-
   python2 setup.py install --root=$pkgdir/ --optimize=1
 
   # Remove unneeded files

[arch-commits] Commit in ubuntu-sso-client/trunk (PKGBUILD oauthlib-0.3.8.patch)

2013-05-20 Thread Balló György 
Date: Monday, May 20, 2013 @ 23:27:51
  Author: bgyorgy
Revision: 91297

upgpkg: ubuntu-sso-client 4.2.0-2

Apply upstream fix for oauthlib API change

Modified:
  ubuntu-sso-client/trunk/PKGBUILD
  ubuntu-sso-client/trunk/oauthlib-0.3.8.patch

--+
 PKGBUILD |6 +++---
 oauthlib-0.3.8.patch |   39 +--
 2 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-20 21:10:18 UTC (rev 91296)
+++ PKGBUILD2013-05-20 21:27:51 UTC (rev 91297)
@@ -3,7 +3,7 @@
 
 pkgname=ubuntu-sso-client
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Desktop service to allow applications to sign into Ubuntu services 
via SSO
 arch=('any')
 url=https://launchpad.net/ubuntu-sso-client;
@@ -15,7 +15,7 @@
 
source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
 oauthlib-0.3.8.patch)
 md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
- 'dfe190f84a8468cff995595fa38a6370')
+ '7eb0cf5ea1318ef5916b49f3c610aacd')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -24,7 +24,7 @@
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
   # Fix error with oautlib=0.3.8
-  patch -Np1 -i $srcdir/oauthlib-0.3.8.patch
+  patch -Np0 -i $srcdir/oauthlib-0.3.8.patch
 
   python2 setup.py build
 }

Modified: oauthlib-0.3.8.patch
===
--- oauthlib-0.3.8.patch2013-05-20 21:10:18 UTC (rev 91296)
+++ oauthlib-0.3.8.patch2013-05-20 21:27:51 UTC (rev 91297)
@@ -1,13 +1,40 @@
-diff -Naur ubuntu-sso-client-4.2.0.orig/ubuntu_sso/utils/webclient/common.py 
ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py
 ubuntu-sso-client-4.2.0.orig/ubuntu_sso/utils/webclient/common.py  
2013-04-02 00:10:25.870644798 +
-+++ ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py   
2013-04-02 00:12:54.226165669 +
-@@ -158,8 +158,7 @@
+=== modified file 'ubuntu_sso/utils/webclient/common.py'
+--- ubuntu_sso/utils/webclient/common.py   2013-02-19 22:12:47 +
 ubuntu_sso/utils/webclient/common.py   2013-04-12 20:11:22 +
+@@ -157,9 +157,12 @@
+   else 
SIGNATURE_TYPE_AUTH_HEADER),
timestamp=str(timestamp))
  
- url, signed_headers, body = oauth_client.sign(
+-url, signed_headers, body = oauth_client.sign(
 -uri, method, parameters if parameters is not None else {},
 -{'Content-Type': 'application/x-www-form-urlencoded'})
-+uri, method)
++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 
+
 ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-04-12 20:11:22 
+
+@@ -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):
+