From 394528fa33141c767e27f49a375035cd68243d9e Mon Sep 17 00:00:00 2001
From: Michel Jouvin <jouvin@lal.in2p3.fr>
Date: Mon, 21 Nov 2016 18:36:33 +0100
Subject: [PATCH] cvmfs: use PKG_VERSION_xxx to test pkg_compare_version()
 return values

---
 features/cvmfs/client.pan | 2 +-
 features/cvmfs/rpms.pan   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/cvmfs/client.pan b/features/cvmfs/client.pan
index 1e73ce89..b845a9c4 100644
--- a/features/cvmfs/client.pan
+++ b/features/cvmfs/client.pan
@@ -99,7 +99,7 @@ include { 'repository/config/cvmfs' };
 #
 include 'quattor/functions/package';
 '/software/components/chkconfig/service' = {
-    if ((pkg_compare_version('2.1', CVMFS_CLIENT_VERSION) == -1) && ! is_defined(SELF['cvmfs'])) {
+    if ((pkg_compare_version('2.1', CVMFS_CLIENT_VERSION) == PKG_VERSION_GREATER) && ! is_defined(SELF['cvmfs'])) {
         SELF['cvmfs'] = nlist('on', '', 'startstop', false);
     };
     SELF;
diff --git a/features/cvmfs/rpms.pan b/features/cvmfs/rpms.pan
index 9c929026..ed80548d 100644
--- a/features/cvmfs/rpms.pan
+++ b/features/cvmfs/rpms.pan
@@ -5,10 +5,10 @@ unique template features/cvmfs/rpms;
 include 'quattor/functions/package';
 
 '/software/packages' = {
-  if ((pkg_compare_version(CVMFS_CLIENT_VERSION, '2.1.20') >= 0) && (OS_VERSION_PARAMS['major'] != 'sl5')) {
-    SELF[escape('cvmfs-config-default')] = dict();
-  } else {
+  if ((pkg_compare_version(CVMFS_CLIENT_VERSION, '2.1.20') == PKG_VERSION_LESS) || (OS_VERSION_PARAMS['major'] == 'sl5')) {
     SELF[escape('cvmfs-keys')] = dict();
+  } else {
+    SELF[escape('cvmfs-config-default')] = dict();
   };
   SELF;
 };