Better version comparison logic

2 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f43f611d5697..ea73c148bc90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = julia-ijulia
 	pkgdesc = Julia-language backend combined with the Jupyter interactive environment
 	pkgver = 1.15.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/JuliaLang/IJulia.jl
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index ba739d9a7e7f..47817eae3a22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=julia-ijulia
 _pkgname=IJulia
 pkgver=1.15.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Julia-language backend combined with the Jupyter interactive environment'
 arch=(any)
 url=https://github.com/JuliaLang/IJulia.jl
@@ -44,17 +44,21 @@ _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] || \"$pkgver\" == vers[1]
-	              merge!(deps, value)
-	            elseif length(vers) == 2
-	              if (version > vers[1] && version <= vers[2]) ||
-	                 (\"$pkgver\" > vers[1] && \"$pkgver\" <= vers[2])
+	            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