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

[Balló György]

    Date: Tuesday, April 2, 2013 @ 02:31:06
  Author: bgyorgy
Revision: 87509

upgpkg: ubuntu-sso-client 4.2.0-1

Update to version 4.2.0

Added:
  ubuntu-sso-client/trunk/oauthlib-0.3.8.patch
Modified:
  ubuntu-sso-client/trunk/PKGBUILD
Deleted:
  ubuntu-sso-client/trunk/fix-nm-check.patch

----------------------+
 PKGBUILD             |   19 ++++++++++---------
 fix-nm-check.patch   |   21 ---------------------
 oauthlib-0.3.8.patch |   13 +++++++++++++
 3 files changed, 23 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-02 00:26:38 UTC (rev 87508)
+++ PKGBUILD	2013-04-02 00:31:06 UTC (rev 87509)
@@ -2,28 +2,29 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntu-sso-client
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 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-oauth' 'python2-pyopenssl' 'python2-imaging' 'twisted' 'gnome-keyring' 'gsettings-desktop-schemas')
+depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 'python2-oauthlib' 'python2-pyopenssl' 'python2-imaging' '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=(http://launchpad.net/$pkgname/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        fix-nm-check.patch)
-md5sums=('54fcd9ef0e58f132324d67127f04eda5'
-         'd19eb994432f32e4e4e38b5dd7a6561f')
+source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        oauthlib-0.3.8.patch)
+md5sums=('1e80d1702ee69cf63242aafaa2c0cc00'
+         'dfe190f84a8468cff995595fa38a6370')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Python2 fix
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
-  # Fix checking for NetworkManager
-  patch -Np1 -i "$srcdir/fix-nm-check.patch"
+  # Fix error with oautlib>=0.3.8
+  patch -Np1 -i "$srcdir/oauthlib-0.3.8.patch"
 
   python2 setup.py build
 }

Deleted: fix-nm-check.patch
===================================================================
--- fix-nm-check.patch	2013-04-02 00:26:38 UTC (rev 87508)
+++ fix-nm-check.patch	2013-04-02 00:31:06 UTC (rev 87509)
@@ -1,21 +0,0 @@
-diff -Naur ubuntu-sso-client-4.0.0.orig/ubuntu_sso/networkstate/linux.py ubuntu-sso-client-4.0.0/ubuntu_sso/networkstate/linux.py
---- ubuntu-sso-client-4.0.0.orig/ubuntu_sso/networkstate/linux.py	2012-06-27 16:51:18.000000000 +0200
-+++ ubuntu-sso-client-4.0.0/ubuntu_sso/networkstate/linux.py	2012-11-26 20:55:19.871804086 +0100
-@@ -45,7 +45,6 @@
- 
- NM_DBUS_INTERFACE = "org.freedesktop.NetworkManager"
- NM_DBUS_OBJECTPATH = "/org/freedesktop/NetworkManager"
--DBUS_UNKNOWN_SERVICE = "org.freedesktop.DBus.Error.ServiceUnknown"
- 
- 
- class NetworkManagerState(object):
-@@ -72,8 +71,7 @@
- 
-     def got_error(self, error):
-         """Called by DBus when the state is retrieved from NM."""
--        if isinstance(error, self.dbus.exceptions.DBusException) and \
--                error.get_dbus_name() == DBUS_UNKNOWN_SERVICE:
-+        if isinstance(error, self.dbus.exceptions.DBusException):
-             logger.debug("Network Manager not present")
-             # Assuming since Network Manager is not installed,
-             # the user has connected in some other way

Added: oauthlib-0.3.8.patch
===================================================================
--- oauthlib-0.3.8.patch	                        (rev 0)
+++ oauthlib-0.3.8.patch	2013-04-02 00:31:06 UTC (rev 87509)
@@ -0,0 +1,13 @@
+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 +0000
++++ ubuntu-sso-client-4.2.0/ubuntu_sso/utils/webclient/common.py	2013-04-02 00:12:54.226165669 +0000
+@@ -158,8 +158,7 @@
+                               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'})
++            uri, method)
+ 
+         return url, signed_headers, body
+