Better version comparison logic

2 files changed, 15 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7063b717c4f9..7af9aac4af94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = julia-versionparsing
 	pkgdesc = Flexible parsing of version-number strings into Julia's built-in VersionNumber type
 	pkgver = 1.1.3
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/stevengj/VersionParsing.jl
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index d96d66c35153..24cc47c0b3b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=julia-versionparsing
 _pkgname=VersionParsing
 pkgver=1.1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Flexible parsing of version-number strings into Julia's built-in VersionNumber type"
 arch=(any)
 url=https://github.com/stevengj/VersionParsing.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