From 11895f189f76d341ae73f0399378c9cc8ff26ff9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Fri, 7 Sep 2012 09:00:32 +0000
Subject: [PATCH] Updating version, ChangeLog and copying the most recent
 configure from ./org.glite.lb for v. 8.2.6-1

---
 org.glite.lb.common/configure                  | 24 ++++++++++++++++++++++++
 org.glite.lb.common/project/ChangeLog          |  4 ++++
 org.glite.lb.common/project/version.properties |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/org.glite.lb.common/configure b/org.glite.lb.common/configure
index 3d43cdb..89e41e1 100755
--- a/org.glite.lb.common/configure
+++ b/org.glite.lb.common/configure
@@ -33,6 +33,7 @@ my $root = $pwd.'/stage';
 my $sysroot = '';
 my $sysconfdir;
 my $localstatedir;
+my $os_type;
 my $staged;
 my $module;
 my $thrflavour = 'gcc64dbgpthr';
@@ -234,6 +235,7 @@ my @opts = (
 	'sysroot:s' => \$sysroot,
 	'sysconfdir=s' => \$sysconfdir,
 	'localstatedir=s' => \$localstatedir,
+	'os-type=s' => \$os_type,
 	'lb-tag=s' => \$lb_tag,
 	'lbjp-common-tag=s' => \$lbjp_tag,
 	'jp-tag=s' => \$jp_tag,
@@ -266,6 +268,7 @@ if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc";
 if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; }
 $sysconfdir=~s/\/$//;
 $localstatedir=~s/\/$//;
+if (not $os_type) { $os_type = os_type(); }
 
 $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq '';
 $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq '';
@@ -1353,6 +1356,7 @@ stagedir = $stagedir
 sysroot = $sysroot
 sysconfdir = $sysconfdir
 localstatedir = $localstatedir
+os_type = $os_type
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
 libdir = $libdir
@@ -2084,6 +2088,24 @@ sub reshuffle_platforms($$) {
 	}
 }
 
+sub os_type {
+	my $ver;
+
+	open FH, '<', '/etc/issue' or return "redhat";
+	$_=<FH>;
+	close FH;
+
+	if (/Debian|Ubuntu/i) { return "debian"; }
+	elsif (/Scientific|Redhat|Centos/i) { return "redhat"; }
+	elsif (/Fedora/i) {
+		$ver = `rpm -q --queryformat '%{version}' fedora-release 2>/dev/null`;
+		if ($ver and $ver >= 15) { return "fedora"; }
+		else { return "redhat"; }
+	} else {
+		return "redhat";
+	}
+}
+
 sub usage {
 	my @ext = keys %externs;
 	my @myjars = keys %jar;
@@ -2097,6 +2119,8 @@ General options (defaults in []):
   --root=DIR			installation root (custom relocation root -> sysroot) [./stage]
   --sysroot=DIR			system root (custom relocation root -> sysroot) []
   --sysconfdir=DIR              system configuration directory [PREFIX/etc]
+  --localstatedir=DIR           system local status directory [PREFIX/var]
+  --os-type=DIST                system type (debian/redhat/fedora)
   --staged=module,module,...	what is already in PREFIX (specify without org.glite.)
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
diff --git a/org.glite.lb.common/project/ChangeLog b/org.glite.lb.common/project/ChangeLog
index 5bd34b3..9dc9262 100644
--- a/org.glite.lb.common/project/ChangeLog
+++ b/org.glite.lb.common/project/ChangeLog
@@ -220,3 +220,7 @@
 8.2.5-1
 - ID mapping structure flattened by one level
 
+8.2.6-1
+- New sources added: CloudManager, VMManager, VMSystem
+- Sources removed from VMRunning and VMShutdown events
+
diff --git a/org.glite.lb.common/project/version.properties b/org.glite.lb.common/project/version.properties
index bfe8c90..6837b12 100644
--- a/org.glite.lb.common/project/version.properties
+++ b/org.glite.lb.common/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=8.2.5
+module.version=8.2.6
 module.age=1
-- 
1.8.2.3