summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurilo2016-03-08 22:17:14 +0300
committerAlexander Kurilo2016-03-08 22:25:03 +0300
commit872e91269aacac4e1957831a5469ae35fe90fc3a (patch)
treefb1841d3dd0b83898e9d1dfde644e4c29653fab6
parentd84caba6f1b4e39ceb9540d6c0091514487fda6e (diff)
downloadaur-872e91269aacac4e1957831a5469ae35fe90fc3a.tar.gz
Add fixes proposed by Thor K. H.
-rw-r--r--.SRCINFO14
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD23
3 files changed, 25 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e19fc0fe5a77..d3efea135ea6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
+# Generated by mksrcinfo v8
+# Tue Mar 8 19:24:54 UTC 2016
pkgbase = csvkit-git
pkgdesc = A suite of utilities for converting to and working with CSV.
- pkgver = 0.9.1.gbf18815
- pkgrel = 2
+ pkgver = 0.9.1.r280.g48f9602
+ pkgrel = 1
url = http://csvkit.readthedocs.org
arch = any
license = MIT
- makedepends = tar
- makedepends = gzip
+ makedepends = git
+ makedepends = python-setuptools
depends = python
depends = python-xlrd>=0.9.2
depends = python-dateutil>=2.0
depends = python-sqlalchemy>=0.9.3
depends = python-openpyxl>=2.0.3
depends = python-six>=1.6.1
- source = csvkit-0.9.1.tar.gz::https://github.com/onyxfish/csvkit/archive/0.9.1.tar.gz
- md5sums = 5708394caa93408254a15269a83cfeed
+ source = csvkit::git://github.com/wireservice/csvkit.git
+ md5sums = SKIP
pkgname = csvkit-git
diff --git a/.gitignore b/.gitignore
index effcdbfdac73..a5c9292af031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/csvkit-*.tar.[gx]z
-/src
-/pkg
+/csvkit/
+/src/
+/pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 5eea2d73c192..cfa69dd4b6a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,27 @@
# Maintainer: Alexander Kurilo <alex@kurilo.me>
# Contributor: Mariusz Szczepańczyk <mszczepanczyk@gmail.com>
-gittag=0.9.1
-gitrev=gbf18815
+# Contributor: Thor K. H. <thor alfakrøll roht dott no>
+
pkgname=csvkit-git
-pkgver=$gittag.$gitrev
-pkgrel=2
+pkgver=0.9.1.r280.g48f9602
+pkgrel=1
pkgdesc="A suite of utilities for converting to and working with CSV."
arch=('any')
url="http://csvkit.readthedocs.org"
license=('MIT')
makedepends=('git')
depends=('python' 'python-xlrd>=0.9.2' 'python-dateutil>=2.0' 'python-sqlalchemy>=0.9.3' 'python-openpyxl>=2.0.3' 'python-six>=1.6.1')
-makedepends=('tar' 'gzip')
-md5sums=('5708394caa93408254a15269a83cfeed')
-source=("csvkit-$gittag.tar.gz::https://github.com/onyxfish/csvkit/archive/$gittag.tar.gz")
+makedepends=('git' 'python-setuptools')
+md5sums=('SKIP')
+source=('csvkit::git://github.com/wireservice/csvkit.git')
+
+pkgver() {
+ cd "$srcdir/csvkit"
+ git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+}
build() {
- cd "$srcdir/csvkit-$gittag"
+ cd "$srcdir/csvkit"
# Quick and dirty fix until the author officially supports dateutil>=2.2
# (see https://github.com/onyxfish/csvkit/issues/370)
sed -i 's/python-dateutil==2.2/python-dateutil>=2.2/' setup.py
@@ -24,7 +29,7 @@ build() {
}
package() {
- cd "$srcdir/csvkit-$gittag"
+ cd "$srcdir/csvkit"
python setup.py install --root="$pkgdir/"
}