update to 1.0.6 and improve build patch

3 files changed, 15 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e3eac3e7605..ca24bb6257e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vale
 	pkgdesc = A customizable, syntax-aware linter for prose.
-	pkgver = 1.0.2
+	pkgver = 1.0.6
 	pkgrel = 1
 	url = https://github.com/errata-ai/vale
 	arch = i686
@@ -11,10 +11,10 @@ pkgbase = vale
 	makedepends = python-docutils
 	provides = vale
 	options = !emptydirs
-	source = https://github.com/errata-ai/vale/archive/v1.0.2.zip
+	source = https://github.com/errata-ai/vale/archive/v1.0.6.zip
 	source = enable_local_build.patch
-	sha256sums = 6a6d67dc5926097c49c264620900833d7e476ebc37cb2671c653a62b5823bebe
-	sha256sums = 69f1efbd1f638cd601a0f5583b85a052aa5bbb6433a9d4a24dba11b29f703422
+	sha256sums = 5fb8ceaa69653f902e5c04b38d0c199a1a853364d62075264e75e591df6c7a48
+	sha256sums = 0761d16f111f793d7388da7bb88fa59daa8ac5a51b2b737ad065226f51beec4b
 
 pkgname = vale
 
diff --git a/PKGBUILD b/PKGBUILD
index ac71bee9580c..f4d5a705ebc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Konstantin Gizdov < arch at kge dot pw >
 pkgname=vale
-pkgver=1.0.2
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="A customizable, syntax-aware linter for prose."
 provides=('vale')
@@ -11,8 +11,8 @@ makedepends=('go' 'ruby' 'python-docutils')
 options=('!emptydirs')
 source=("https://github.com/errata-ai/${pkgname}/archive/v${pkgver}.zip"
         'enable_local_build.patch')
-sha256sums=('6a6d67dc5926097c49c264620900833d7e476ebc37cb2671c653a62b5823bebe'
-            '69f1efbd1f638cd601a0f5583b85a052aa5bbb6433a9d4a24dba11b29f703422')
+sha256sums=('5fb8ceaa69653f902e5c04b38d0c199a1a853364d62075264e75e591df6c7a48'
+            '0761d16f111f793d7388da7bb88fa59daa8ac5a51b2b737ad065226f51beec4b')
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,7 +26,7 @@ build() {
     mkdir -p "${srcdir}/ruby"
     export HOME="${srcdir}/ruby"
     export GEM_HOME="${HOME}/.gem/ruby/${RUBY_VER}"
-    export GEM_HOME_OLD="${HOME}/.gem/ruby/2.5.0"
+    export GEM_HOME_OLD="${HOME}/.gem/ruby/2.5.0"  # for some reason is wants 2.5.0 too
     export PATH="${srcdir}/gopath/bin:${GEM_HOME}/bin:${GEM_HOME_OLD}/bin:$PATH"
     mkdir -p "${srcdir}/gopath/src/github.com/errata-ai/vale"
     rsync -az "${srcdir}/${pkgname}-${pkgver}/" "${srcdir}/gopath/src/github.com/errata-ai/vale/"
diff --git a/enable_local_build.patch b/enable_local_build.patch
index 9a1751191516..89c37ad920c5 100644
--- a/enable_local_build.patch
+++ b/enable_local_build.patch
@@ -1,18 +1,18 @@
-diff -aur vale-0.10.1-old/Makefile vale-0.10.1-new/Makefile
---- vale-0.10.1-old/Makefile	2018-02-17 04:00:48.000000000 +0100
-+++ vale-0.10.1-new/Makefile	2018-03-02 00:01:30.630943963 +0100
+diff -aur vale-1.0.6-old/Makefile vale-1.0.6-new/Makefile
+--- vale-1.0.6-old/Makefile	2018-10-23 18:12:29.833646925 +0100
++++ vale-1.0.6-new/Makefile	2018-10-23 18:13:54.895016355 +0100
 @@ -5,6 +5,7 @@
  CURR_SHA=$(shell git rev-parse --verify HEAD)
  
  LDFLAGS=-ldflags "-s -w -X main.version=$(LAST_TAG)"
-+RUBY_CUSTOM_PATH=/home/${USER}/.gem/ruby/$(shell ruby -e 'puts RUBY_VERSION')/bin
++RUBY_CUSTOM_PATH=$(GEM_HOME)/bin
  
  .PHONY: data test lint ci cross install bump rules setup bench compare release
  
-@@ -66,8 +67,10 @@
+@@ -64,8 +65,10 @@
+ 	go get github.com/aclements/go-misc/benchmany
  	go get -u github.com/alecthomas/gometalinter
  	go get -u github.com/jteeuwen/go-bindata/...
- 	gometalinter --install
 -	bundle install
 -	gem specific_install -l https://github.com/jdkato/aruba.git -b d-win-fix
 +	gem install --no-rdoc --no-ri bundle
@@ -21,4 +21,4 @@ diff -aur vale-0.10.1-old/Makefile vale-0.10.1-new/Makefile
 +	gem specific_install -l https://github.com/jdkato/aruba.git
  
  rules:
- 	go-bindata -ignore=\\.DS_Store -pkg="rule" -o rule/rule.go rule/*.yml
+ 	go-bindata -ignore=\\.DS_Store -pkg="rule" -o rule/rule.go rule/**/*.yml