From 74484c088ce2da3529e8b7b4e1051c63f8f2502a Mon Sep 17 00:00:00 2001
From: loredo <loredo@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 23 Apr 2019 18:41:38 +0000
Subject: [PATCH] Meta.pm: fix numeric equation

git-svn-id: https://svn.fhem.de/fhem/trunk@19246 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/Meta.pm | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/fhem/FHEM/Meta.pm b/fhem/FHEM/Meta.pm
index 51e919990..547e0fcc8 100644
--- a/fhem/FHEM/Meta.pm
+++ b/fhem/FHEM/Meta.pm
@@ -1780,23 +1780,33 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
                                         }
                                     }
 
-                                    $v =
-                                         $v
-                                      && $v > $pkgMeta->{prereqs}{runtime}
-                                      {$pkgIreq}{$pkgI}
-                                      ? $v
-                                      : $pkgMeta->{prereqs}{runtime}
-                                      {$pkgIreq}{$pkgI};
+                                    if ($v) {
+                                        $v = version->parse($v)->numify;
+                                        $v = version->parse(
+                                            $pkgMeta->{prereqs}{runtime}
+                                              {$pkgIreq}{$pkgI} )->numify
+                                          if (
+                                            $v < version->parse(
+                                                $pkgMeta->{prereqs}{runtime}
+                                                  {$pkgIreq}{$pkgI}
+                                            )->numify
+                                          );
+                                    }
 
                                     if (
                                         !exists(
                                             $modMeta->{prereqs}{runtime}
                                               {$prio}{$pkgI}
                                         )
-                                        || ( $pkgMeta->{prereqs}{runtime}
+                                        || (
+                                            $pkgMeta->{prereqs}{runtime}
                                             {$pkgIreq}{$pkgI} ne '0'
-                                            && $modMeta->{prereqs}{runtime}
-                                            {$prio}{$pkgI} < $v )
+                                            && $v
+                                            && version->parse(
+                                                $modMeta->{prereqs}{runtime}
+                                                  {$prio}{$pkgI}
+                                            )->numify < $v
+                                        )
                                       )
                                     {
                                         $modMeta->{prereqs}{runtime}{$prio}
@@ -3277,7 +3287,7 @@ sub __SetXVersion {
       "abstract": "FHEM Entwickler Paket, um Metadaten Unterstützung zu aktivieren"
     }
   },
-  "version": "v0.6.2",
+  "version": "v0.6.3",
   "release_status": "testing",
   "x_changelog": {
     "2019-04-18": {
@@ -3333,7 +3343,7 @@ sub __SetXVersion {
         "JSON::PP": 0
       },
       "recommends": {
-        "JSON": "2.91_01",
+        "JSON": "2.92",
         "Module::CoreList": 0,
         "Perl::PrereqScanner::NotQuiteLite": 0
       },