Better version comparison logic

2 files changed, 16 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 219557ae963a..73cedea23e07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = julia-datastructures
 	pkgdesc = Julia implementation of Data structures
 	pkgver = 0.14.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/JuliaCollections/DataStructures.jl
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index a3e51a9373fc..a482f637eaf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=julia-datastructures
 _pkgname=DataStructures
 pkgver=0.14.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Julia implementation of Data structures'
 arch=(any)
 url=https://github.com/JuliaCollections/DataStructures.jl
@@ -32,14 +32,23 @@ _deps() {
 	julia -e "using Pkg
 
 	          alldeps = Pkg.TOML.parsefile(\"$srcdir/$pkgname-Deps.toml\")
-	          version = join(split(\"$pkgver\", \".\")[1:2],\".\")
+	          version = VersionNumber(\"$pkgver\")
+	          majmin  = VersionNumber(\"${pkgver%.*}\")
 	          deps = Dict{String,Any}()
 
 	          for (key, value) in alldeps
 	            vers = split(key, \"-\")
-
-	            if version == vers[1] || (version > vers[1] && length(vers) == 2 && version <= vers[2])
-	              merge!(deps, value)
+	            lower = VersionNumber(vers[1])
+	            if length(vers) == 2
+	              upper = VersionNumber(vers[2])
+	              if (majmin  >= lower && majmin  <= upper) ||
+	                 (version >= lower && version <= upper)
+	                merge!(deps, value)
+	              end
+	            elseif length(vers) == 1
+	              if majmin == lower || version == lower
+	                merge!(deps, value)
+	              end
 	            end
 	          end
 
@@ -68,5 +77,5 @@ package() {
 # Has circular dependency on julia-primes
 #check() {
 #	cd $_pkgname.jl-$pkgver
-#	JULIA_LOAD_PATH=src: julia test/runtests.jl
+#	HOME="$srcdir" JULIA_LOAD_PATH=src:$JULIA_LOAD_PATH julia test/runtests.jl
 #}