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

[Lukas Fleischer]

    Date: Saturday, February 20, 2016 @ 10:39:28
  Author: lfleischer
Revision: 162640

upgpkg: borg 0.30.1-2

Fixes FS#48258.

Added:
  borg/trunk/0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
Modified:
  borg/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch |   28 ++++++++++
 PKGBUILD                                                        |    9 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)

Added: 0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
===================================================================
--- 0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch	                        (rev 0)
+++ 0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch	2016-02-20 09:39:28 UTC (rev 162640)
@@ -0,0 +1,28 @@
+From 7165e1d571ab82bb80c6b03a413e2667aa567049 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <lfleischer at archlinux.org>
+Date: Sat, 20 Feb 2016 10:17:37 +0100
+Subject: [PATCH] Revert "require msgpack==0.4.6 - no python 3.2 support in
+ 0.4.7+"
+
+This reverts commit a9f2f65154d64cf711c864977a6f8aadeae47d18.
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 60b9f65..08e5179 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,8 +19,7 @@ on_rtd = os.environ.get('READTHEDOCS')
+ 
+ # msgpack pure python data corruption was fixed in 0.4.6.
+ # Also, we might use some rather recent API features.
+-# Note: 0.4.7 is also OK, but has no Python 3.2 support any more.
+-install_requires=['msgpack-python==0.4.6', ]
++install_requires=['msgpack-python>=0.4.6', ]
+ 
+ extras_require = {
+     # llfuse 0.40 (tested, proven, ok), needs FUSE version >= 2.8.0
+-- 
+2.7.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-20 09:36:18 UTC (rev 162639)
+++ PKGBUILD	2016-02-20 09:39:28 UTC (rev 162640)
@@ -4,7 +4,7 @@
 pkgname=borg
 _pkgname=borgbackup
 pkgver=0.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Deduplicating backup program with compression and authenticated encryption'
 url='https://borgbackup.github.io/'
 license=('BSD')
@@ -17,10 +17,17 @@
 provides=('borgbackup')
 replaces=('borgbackup')
 source=("https://pypi.python.org/packages/source/b/$_pkgname/$_pkgname-$pkgver.tar.gz"
+        '0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch'
         borg.coveragerc)
 sha256sums=('775a2a4b5441fa239e6c3c87e7f08f830449046d045ed938a9bce2edfa5a2184'
+            '891a79963857e62fdd0acff7f939947d25bb8aa66421ce41dd0808bbbf304cb7'
             '024bf101b25f9d35b83f86ce794c85f404d7acb212e047b4fca68b108dff21a7')
 
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -p1 -i ../0001-Revert-require-msgpack-0.4.6-no-python-3.2-support-i.patch
+}
+
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
   python setup.py build