perl dependency JSON-XS: set an explicit dependency on the RPM version

- Fixes quattor#114 (failure to match Perl-generated requirement on SL5)
ttyS4 · Jul 19, 2016 · 74da881 · 74da881
1 parent 865cefe
commit 74da881
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -278,7 +278,9 @@
         <requires>
           <require>perl(Crypt::SSLeay)</require>
           <require>perl(LWP::Protocol::https)</require>
-        </requires>
+          <!-- perl-JSON-XS rpm dependency set explicitly; EL5 metadata doesn't play nicely with 'perl(JSON::XS) >= 2.3.0'
+               set by 'use perl-JSON-XS 2.3.0' and version requirement is missing if 'use perl-JSON-XS v2.3.0' is used -->
+          <require>perl-JSON-XS &gt;= 2.3.0</require>        </requires>
         <mappings>
           <mapping>
             <directory>/usr/lib/perl/EDG/WP4/CCM</directory>

diff --git a/src/main/perl/JSONProfileSimple.pm b/src/main/perl/JSONProfileSimple.pm
@@ -31,7 +31,7 @@ use strict;
 use warnings;
 
 use EDG::WP4::CCM::Fetch qw(ComputeChecksum);
-use JSON::XS 2.3.0;
+use JSON::XS v2.3.0;
 
 $SIG{__DIE__} = \&confess;
 

diff --git a/src/main/perl/JSONProfileTyped.pm b/src/main/perl/JSONProfileTyped.pm
@@ -52,7 +52,7 @@ use strict;
 use warnings;
 
 use EDG::WP4::CCM::Fetch qw(ComputeChecksum);
-use JSON::XS 2.3.0;
+use JSON::XS v2.3.0;
 use B;
 use Scalar::Util qw(blessed);