[arch-commits] Commit in electrum/trunk (2 files)

[Timothy Redaelli]

    Date: Wednesday, March 2, 2016 @ 11:42:11
  Author: tredaelli
Revision: 164098

upgpkg: electrum 2.6.1-1

Modified:
  electrum/trunk/PKGBUILD
Deleted:
  electrum/trunk/60b595356b8c049adc296deb0ffe65b357500ab4.patch

------------------------------------------------+
 60b595356b8c049adc296deb0ffe65b357500ab4.patch |   29 -----------------------
 PKGBUILD                                       |   20 +++++----------
 2 files changed, 7 insertions(+), 42 deletions(-)

Deleted: 60b595356b8c049adc296deb0ffe65b357500ab4.patch
===================================================================
--- 60b595356b8c049adc296deb0ffe65b357500ab4.patch	2016-03-02 09:49:41 UTC (rev 164097)
+++ 60b595356b8c049adc296deb0ffe65b357500ab4.patch	2016-03-02 10:42:11 UTC (rev 164098)
@@ -1,29 +0,0 @@
-From 60b595356b8c049adc296deb0ffe65b357500ab4 Mon Sep 17 00:00:00 2001
-From: Andreas Hilboll <andreas at hilboll.de>
-Date: Tue, 5 Jan 2016 12:13:15 +0100
-Subject: [PATCH] BUG: allow non-root installation on linux
-
-fixes #1607
----
- setup.py | 5 +++++
- 1 file changed, 5 insertions(+)
- mode change 100644 => 100755 setup.py
-
-diff --git a/setup.py b/setup.py
-old mode 100644
-new mode 100755
-index 117a7ba..943f572
---- a/setup.py
-+++ b/setup.py
-@@ -17,6 +17,11 @@
- 
- 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'])

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-02 09:49:41 UTC (rev 164097)
+++ PKGBUILD	2016-03-02 10:42:11 UTC (rev 164098)
@@ -5,8 +5,8 @@
 # http://bitcoin-otc.com/viewgpg.php?nick=ThomasV
 
 pkgname=electrum
-pkgver=2.6
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
 pkgdesc="Lightweight Bitcoin wallet"
 arch=('any')
 depends=('python2-ecdsa' 'python2-jsonrpclib' 'python2-pbkdf2' 'python2-requests' 'python2-pyasn1' 'python2-pyasn1-modules' 'python2-qrcode'
@@ -17,14 +17,11 @@
             'zbar: QR code reading support')
 url="https://electrum.org"
 license=(MIT)
-source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz"{,.asc}
-        60b595356b8c049adc296deb0ffe65b357500ab4.patch)
-md5sums=('63039f6e307274829a9b8cd0662e40e9'
-         'SKIP'
-         '99509675fb508c1d10ded5cb8dd1acff')
-sha256sums=('6adb213f042fc4cdefca6675948d3a7d4b5d7ec89178d3388626ee5e0e032d29'
-            'SKIP'
-            'f157421a54ffd001fb0957a557f0a3a91709424ae4b78b97f0eda9e053ac3c81')
+source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz"{,.asc})
+md5sums=('27b06f5abc7245de77cfb278eac287b0'
+         'SKIP')
+sha256sums=('3882977bbb55767f1cdb74d677c176a51dd0625fce8e069d3525cecf61f00693'
+            'SKIP')
 validpgpkeys=('6694D8DE7BE8EE5631BED9502BD5824B7F9470E6')
 
 provides=('electrum')
@@ -35,9 +32,6 @@
 
   find . -type f -exec sed -i 's#/usr/bin/python$#/usr/bin/python2#g' {} +
   find . -type f -exec sed -i 's#/usr/bin/env python$#/usr/bin/env python2#g' {} +
-
-  # Revert commit 60b595356b8c049adc296deb0ffe65b357500ab4
-  patch -Rp1 -i "$srcdir/60b595356b8c049adc296deb0ffe65b357500ab4.patch"
 }
 
 build() {