bump to 2.0.6 and a few other tweaks

1. bump to 2.0.6
2. remove ChangeLog (no interest in maintaining it personally)
3. only pull RPM from github.com/harelba/packages-for-q
4. append new line character to .gitignore
5. update vim modeline in PKGBUILD

4 files changed, 19 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e6577696f84..f86e0a53b30b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,13 @@
-# Generated by mksrcinfo v8
-# Wed Dec 20 11:36:10 UTC 2017
 pkgbase = q
 	pkgdesc = SQL-like queries on tabular text data, including joins and subqueries
-	pkgver = 1.7.1
+	pkgver = 2.0.6
 	pkgrel = 1
 	url = https://github.com/harelba/q
-	changelog = ChangeLog
-	arch = any
+	arch = x86_64
 	license = GPL3
-	depends = python2
-	source = https://github.com/harelba/q/archive/1.7.1.tar.gz
-	source = https://github.com/harelba/packages-for-q/raw/master/rpms/q-text-as-data-1.7.1-1.noarch.rpm
-	sha1sums = ca26b3077b310d547080ba544ffba8a8bcbde7f9
-	sha1sums = ae4e4fb508676f60a3ba44171a62cd83ddfb2f2f
+	depends = python
+	source = https://github.com/harelba/packages-for-q/raw/master/rpms/q-text-as-data-2.0.6-1.x86_64.rpm
+	sha256sums = d012b7f5276cfa630c518906da7d2aec4b6556f20594b76957549dbc3f5b0d92
 
 pkgname = q
 
diff --git a/.gitignore b/.gitignore
index a3538042b37d..4046b86e8fc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *.tar
 *.tar.gz
-*.rpm
\ No newline at end of file
+*.rpm
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 928bd06f2049..000000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-2017-12-20 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.7.1-1 :
-	New upstream release
-
-2017-04-24 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.6.3-1 :
-	New upstream release
-
-2014-12-13 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.5.0-1 :
-	New upstream release
-	
-2014-06-19 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.4.0-2 :
-	Add man page extracted from RPM package
-
-2014-06-15 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.4.0-1 :
-	New upstream release
-
-2014-03-25 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.3.0-1 :
-	New upstream release
-
-2014-02-25 Fabien Dubosson <fabien.dubosson@gmail.com>
-
-	* 1.2.0-1 :
-	Package created
diff --git a/PKGBUILD b/PKGBUILD
index dde813035807..8f6c9a989fc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,23 @@
 # Maintainer: Frederick Zhang <frederick888@tsundere.moe>
 # Contributor: Fabien Dubosson <fabien.dubosson@gmail.com>
 
-pkgname="q"
-pkgver="1.7.1"
-pkgrel="1"
+pkgname=q
+pkgver=2.0.6
+pkgrel=1
 pkgdesc="SQL-like queries on tabular text data, including joins and subqueries"
 url="https://github.com/harelba/q"
 license=('GPL3')
-arch=('any')
-depends=('python2')
-changelog="ChangeLog"
-source=("https://github.com/harelba/${pkgname}/archive/${pkgver}.tar.gz"
-        "https://github.com/harelba/packages-for-q/raw/master/rpms/q-text-as-data-${pkgver}-1.noarch.rpm")
-sha1sums=('ca26b3077b310d547080ba544ffba8a8bcbde7f9'
-          'ae4e4fb508676f60a3ba44171a62cd83ddfb2f2f')
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}/"
-
-    # Replace shell bang with python2. Not compatible with python3 yet.
-    sed -e '0,/python/{s/python/python2/}' -i "bin/${pkgname}"
-}
+arch=('x86_64')
+depends=('python')
+source=("https://github.com/harelba/packages-for-q/raw/master/rpms/q-text-as-data-${pkgver}-1.x86_64.rpm")
+sha256sums=('d012b7f5276cfa630c518906da7d2aec4b6556f20594b76957549dbc3f5b0d92')
 
 package() {
-    cd "${srcdir}/"
-
-    install -D -m755 "${pkgname}-${pkgver}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -D -m755 "usr/share/man/man1/${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"
+  install -D -m755 "${srcdir}/usr/share/q-text-as-data/q" "${pkgdir}/usr/bin/${pkgname}"
+  for doc in "${srcdir}/usr/share/doc/q-text-as-data-${pkgver}/"*; do
+    install -D -m644 "$doc" "${pkgdir}/usr/share/doc/q-text-as-data-${pkgver}/$doc"
+  done
+  install -D -m755 "${srcdir}/usr/share/man/man1/${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"
 }
 
-# vim:set ts=4 sw=4 et:
+# vim: set tabstop=4 shiftwidth=2 expandtab smarttab autoindent: