update pkgver to 20160105, fix setup.py

3 files changed, 30 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa72b37202e4..66b18d2331f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Dec 20 19:12:27 UTC 2015
+# Tue Jan  5 19:07:32 UTC 2016
 pkgbase = electrum-git
 	pkgdesc = Lightweight Bitcoin wallet
-	pkgver = 20151214
+	pkgver = 20160105
 	pkgrel = 1
 	url = https://github.com/spesmilo/electrum
 	install = electrum.install
@@ -40,7 +40,9 @@ pkgbase = electrum-git
 	provides = electrum
 	conflicts = electrum
 	source = git+https://github.com/spesmilo/electrum
+	source = setup.py.patch
 	sha256sums = SKIP
+	sha256sums = ff3583bbaf13de6e4284aa0e6651a21f4f99d7039c237c5be965cf656402974f
 
 pkgname = electrum-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 91fc62524d58..38be8e817ff9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 #
 
 pkgname=electrum-git
-pkgver=20151214
+pkgver=20160105
 pkgrel=1
 pkgdesc="Lightweight Bitcoin wallet"
 arch=('any')
@@ -43,8 +43,10 @@ optdepends=('desktop-file-utils: update desktop icon'
             'zbar: QR code reading support')
 url="https://github.com/spesmilo/electrum"
 license=('GPL3')
-source=(git+https://github.com/spesmilo/electrum)
-sha256sums=('SKIP')
+source=(git+https://github.com/spesmilo/electrum
+        setup.py.patch)
+sha256sums=('SKIP'
+            'ff3583bbaf13de6e4284aa0e6651a21f4f99d7039c237c5be965cf656402974f')
 provides=('electrum')
 conflicts=('electrum')
 install=electrum.install
@@ -57,6 +59,9 @@ pkgver() {
 prepare() {
   cd ${pkgname%-git}
 
+  msg2 'Fixing setup.py...'
+  git apply "$srcdir/setup.py.patch"
+
   msg2 'Fixing app.fil...'
   # plugins/labels.py → plugins/labels/labels.py
   sed -i 's@plugins/labels.py@plugins/labels/labels.py@' app.fil
diff --git a/setup.py.patch b/setup.py.patch
new file mode 100644
index 000000000000..19f713a78e11
--- /dev/null
+++ b/setup.py.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+old mode 100755
+new mode 100644
+index 943f572..117a7ba
+--- a/setup.py
++++ b/setup.py
+@@ -17,11 +17,6 @@ data_files = []
+ 
+ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
+     usr_share = os.path.join(sys.prefix, "share")
+-    if not os.access(usr_share, os.W_OK):
+-        if 'XDG_DATA_HOME' in os.environ.keys():
+-            usr_share = os.environ['$XDG_DATA_HOME']
+-        else:
+-            usr_share = os.path.expanduser('~/.local/share')
+     data_files += [
+         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
+         (os.path.join(usr_share, 'pixmaps/'), ['icons/electrum.png'])