[arch-commits] Commit in (electrum/trunk/PKGBUILD uthash/trunk/PKGBUILD)

[Timothy Redaelli]

    Date: Friday, February 26, 2016 @ 18:51:44
  Author: tredaelli
Revision: 163515

Partially revert 163512

Modified:
  electrum/trunk/PKGBUILD
  uthash/trunk/PKGBUILD

-------------------------+
 electrum/trunk/PKGBUILD |   25 +++++++++----------------
 uthash/trunk/PKGBUILD   |    2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

Modified: electrum/trunk/PKGBUILD
===================================================================
--- electrum/trunk/PKGBUILD	2016-02-26 17:48:10 UTC (rev 163514)
+++ electrum/trunk/PKGBUILD	2016-02-26 17:51:44 UTC (rev 163515)
@@ -5,7 +5,7 @@
 # http://bitcoin-otc.com/viewgpg.php?nick=ThomasV
 
 pkgname=electrum
-pkgver=2.6
+pkgver=2.5.4
 pkgrel=1
 pkgdesc="Lightweight Bitcoin wallet"
 arch=('any')
@@ -16,15 +16,12 @@
             'python2-matplotlib: plot transaction history in graphical mode'
             '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')
+license=('GPL3')
+source=("https://download.electrum.org/${pkgver}/${pkgname^}-${pkgver}.tar.gz"{,.asc})
+md5sums=('a36929bf236c22095e656a3b34003af2'
+         'SKIP')
+sha256sums=('c0b00f440884fe3f087e842c44914e1c5f1139d0288ecb74ba6e1ff0b2504aa3'
+            'SKIP')
 validpgpkeys=('6694D8DE7BE8EE5631BED9502BD5824B7F9470E6')
 
 provides=('electrum')
@@ -33,11 +30,8 @@
 prepare() {
   cd ${pkgname^}-${pkgver}
 
-  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"
+  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' {} +
 }
 
 build() {
@@ -51,5 +45,4 @@
   cd ${pkgname^}-${pkgver}
 
   python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -D -m644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

Modified: uthash/trunk/PKGBUILD
===================================================================
--- uthash/trunk/PKGBUILD	2016-02-26 17:48:10 UTC (rev 163514)
+++ uthash/trunk/PKGBUILD	2016-02-26 17:51:44 UTC (rev 163515)
@@ -2,7 +2,7 @@
 # Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Contributor: Michael Frey <mail at mfrey.net>
 pkgname=uthash
-pkgver=1.9.9.1
+pkgver=1.9.9
 pkgrel=1
 pkgdesc="C preprocessor implementations of a hash table and a linked list"
 arch=('any')