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

[Christian Rebischke]

    Date: Friday, March 9, 2018 @ 15:06:40
  Author: shibumi
Revision: 305298

upgpkg: electrum 3.1.0-2

This release fixes #57756 

Added:
  electrum/trunk/0001-prevent-requirements.txt-from-being-installed-to-usr.patch
Modified:
  electrum/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-prevent-requirements.txt-from-being-installed-to-usr.patch |   39 ++++++++++
 PKGBUILD                                                        |   13 ++-
 2 files changed, 49 insertions(+), 3 deletions(-)

Added: 0001-prevent-requirements.txt-from-being-installed-to-usr.patch
===================================================================
--- 0001-prevent-requirements.txt-from-being-installed-to-usr.patch	                        (rev 0)
+++ 0001-prevent-requirements.txt-from-being-installed-to-usr.patch	2018-03-09 15:06:40 UTC (rev 305298)
@@ -0,0 +1,39 @@
+From e72947c8fd50575d69cb005a52f99aeef66f4186 Mon Sep 17 00:00:00 2001
+From: Marcel O'Neil <marcel at marceloneil.com>
+Date: Wed, 7 Mar 2018 15:15:54 -0500
+Subject: [PATCH] prevent requirements.txt from being installed to /usr
+
+---
+ MANIFEST.in | 2 ++
+ setup.py    | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index 4fa5491a..b7355bd9 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -4,6 +4,8 @@ include electrum.conf.sample
+ include electrum.desktop
+ include *.py
+ include electrum
++include contrib/requirements/requirements.txt
++include contrib/requirements/requirements-hw.txt
+ recursive-include lib *.py
+ recursive-include gui *.py
+ recursive-include plugins *.py
+diff --git a/setup.py b/setup.py
+index 63581a61..030993b5 100755
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ version = imp.load_source('version', 'lib/version.py')
+ if sys.version_info[:3] < (3, 4, 0):
+     sys.exit("Error: Electrum requires Python version >= 3.4.0...")
+ 
+-data_files = ['contrib/requirements/' + r for r in ['requirements.txt', 'requirements-hw.txt']]
++data_files = []
+ 
+ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
+     parser = argparse.ArgumentParser()
+-- 
+2.16.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-09 15:06:38 UTC (rev 305297)
+++ PKGBUILD	2018-03-09 15:06:40 UTC (rev 305298)
@@ -5,7 +5,7 @@
 
 pkgname=electrum
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight Bitcoin wallet"
 arch=('any')
 depends=('python-pyaes' 'python-ecdsa' 'python-pbkdf2' 'python-requests' 'python-qrcode'
@@ -17,11 +17,18 @@
             'zbar: QR code reading support')
 url="https://electrum.org"
 license=(MIT)
-source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz"{,.asc})
+source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz"{,.asc}
+        '0001-prevent-requirements.txt-from-being-installed-to-usr.patch')
 sha512sums=('516ebb34711045abf145eca916233cfb37cca22bfb197a02df67f33886e6988c27a14b428f3ccea3f3d208cce520971bda08c20f274e0cf5dcdadbc76ed15847'
-            'SKIP')
+            'SKIP'
+            '89f07323c049b7665ded169f8293b696f8ddcd49f2e37186a4c7cb68e05abe3cc4c4fe6b2608c05d1d3d9a7477f8dc1b8e84e62c68583e45c5ff1d34f4b17b1b')
 validpgpkeys=('6694D8DE7BE8EE5631BED9502BD5824B7F9470E6')
 
+prepare() {
+  cd "${pkgname^}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-prevent-requirements.txt-from-being-installed-to-usr.patch"
+}
+
 build() {
   cd "${pkgname^}-${pkgver}"