Updating version, ChangeLog and copying the most recent configure from ./org.glite...

diff --git a/org.glite.lb.nagios/configure b/org.glite.lb.nagios/configure
index f2880c2..3d43cdb 100755 (executable)
--- a/org.glite.lb.nagios/configure
+++ b/org.glite.lb.nagios/configure
@@ -1712,8 +1712,11 @@ sub mode_etics {
        top_srcdir = ..
        $flags
        EOF";
-                       $cmd{default}{compile} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir}";
-                       $cmd{default}{install} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir} install";
+                       # no stage builds since EMI-3
+                       if ($project ne 'emi' or $project_version <= 2) {
+                               $cmd{default}{compile} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir}";
+                               $cmd{default}{install} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir} install";
+                       }
                        mode_etics_packaging($fmod, \%cmd,
                                "make prefix=\${prefix}$project{local_prefix} rpm-prepare
        cp gridsite.spec ../\n\t",
@@ -1757,12 +1760,15 @@ sub mode_etics {
        }
        else {
                $cmd{default}{configure} = "/usr/bin/perl $confdir/configure $project{flavours} --root=\${prefix} --prefix=$project{local_prefix} --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts";
-               $cmd{default}{compile} = 'make';
-               $cmd{default}{test} = 'make check';
-               $cmd{default}{install} = 'make install';
-               if ($subsys eq 'lb' and $module eq 'client') {
-                       $cmd{default}{compile} = "make rpath=$project{local_prefix}/\${libdir}";
-                       $cmd{default}{install} = "make install post-install rpath=$project{local_prefix}/\${libdir}";
+               # no stage builds since EMI-3
+               if ($project ne 'emi' or $project_version <= 2) {
+                       $cmd{default}{compile} = 'make';
+                       $cmd{default}{test} = 'make check';
+                       $cmd{default}{install} = 'make install';
+                       if ($subsys eq 'lb' and $module eq 'client') {
+                               $cmd{default}{compile} = "make rpath=$project{local_prefix}/\${libdir}";
+                               $cmd{default}{install} = "make install post-install rpath=$project{local_prefix}/\${libdir}";
+                       }
                }
                mode_etics_packaging($fmod, \%cmd, "make dist\n\t", "make dist\n\t");
        }

diff --git a/org.glite.lb.nagios/project/ChangeLog b/org.glite.lb.nagios/project/ChangeLog
index eff14c3..858dc5a 100644 (file)
--- a/org.glite.lb.nagios/project/ChangeLog
+++ b/org.glite.lb.nagios/project/ChangeLog
@@ -28,3 +28,8 @@
 1.2.1-1
 - Simplified source tarball and packages distribution
 
+1.2.2-1
+- Real-workd experience reflected in the probe
+  - partial support for krb5 mech
+  - support for generating proxies form host certificates
+

diff --git a/org.glite.lb.nagios/project/version.properties b/org.glite.lb.nagios/project/version.properties
index ed71773..ba9efed 100644 (file)
--- a/org.glite.lb.nagios/project/version.properties
+++ b/org.glite.lb.nagios/project/version.properties
@@ -1,3 +1,3 @@
 # $Header
-module.version=1.2.1
+module.version=1.2.2
 module.age=1