From 9858a0734e98a48c30f49becd6401ec0120451e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 29 Aug 2012 08:35:22 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 1.4.3-1 --- org.glite.lb.doc/configure | 22 ++++++++++++++-------- org.glite.lb.doc/project/ChangeLog | 4 ++++ org.glite.lb.doc/project/version.properties | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/org.glite.lb.doc/configure b/org.glite.lb.doc/configure index f2880c2..3d43cdb 100755 --- a/org.glite.lb.doc/configure +++ b/org.glite.lb.doc/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.doc/project/ChangeLog b/org.glite.lb.doc/project/ChangeLog index 4b723ff..3b8c43b 100644 --- a/org.glite.lb.doc/project/ChangeLog +++ b/org.glite.lb.doc/project/ChangeLog @@ -192,3 +192,7 @@ - Web querying interface explained - HTML branding explained +1.4.3-1 +- Explanation of the "flags" query string +- Summary of all query strings started + diff --git a/org.glite.lb.doc/project/version.properties b/org.glite.lb.doc/project/version.properties index b54194c..bf251d1 100644 --- a/org.glite.lb.doc/project/version.properties +++ b/org.glite.lb.doc/project/version.properties @@ -1,3 +1,3 @@ # $Header$ -module.version=1.4.2 +module.version=1.4.3 module.age=1 -- 1.8.2.3