Wed Apr 3 00:04:48 PDT 2013

1 files changed, 18 insertions, 21 deletions

diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD
index 798331ad9..15bcde899 100644
--- a/community/ubuntuone-client/PKGBUILD
+++ b/community/ubuntuone-client/PKGBUILD
@@ -1,41 +1,34 @@
-# $Id: PKGBUILD 82715 2013-01-23 12:42:21Z bgyorgy $
+# $Id: PKGBUILD 87512 2013-04-02 00:39:00Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ubuntuone-client"
-license=('GPL')
-depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake')
+license=('GPL' 'CCPL:cc-by-sa')
+depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'imake' 'python2-distutils-extra')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        1339_1338.diff
-        fix-notify-hint.patch
-        lp1093111.patch)
-md5sums=('738039703d4dcf54518a725f8ffbc4de'
-         'e82e80c229de06692988c1f938a34fb9'
-         '54dfeb2be011f0a12ea7cfa0f0c19bec'
-         'ca79cb558231639e28be7276017ae91c')
+source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz
+        fix-notify-hint.patch)
+md5sums=('37d2de5c6e795e75f447682ee1c3bacc'
+         'd3c445a9957a80471a84f323f24e8f84'
+         'c38cb043e3241f12610ed6eb9ae0f087')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
-  # Improve TransfersMenu declaration to avoid problems
-  patch -Np0 -i "$srcdir/1339_1338.diff"
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
 
   # Workaround for crash in notification-daemon
   # https://bugzilla.gnome.org/show_bug.cgi?id=665166
   patch -Np1 -i "$srcdir/fix-notify-hint.patch"
 
-  # Fix compatibility with glibc 2.17
-  # https://bugs.launchpad.net/ubuntuone-client/+bug/1093111
-  patch -Np1 -i "$srcdir/lp1093111.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static \
               PYTHON=python2
@@ -47,6 +40,10 @@ package() {
 
   make DESTDIR="$pkgdir/" install
 
+  # Install data
+  cd "$srcdir/$pkgname-data-$pkgver"
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+
   # We don't have Apport in Arch Linux
   rm -r "$pkgdir"/{etc/apport,usr/share/apport}
 }