From 8a18ddf6d137ec13c71b9fa5b0bdac48e3c5ca5b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Wed, 5 Sep 2012 14:52:05 +0000
Subject: [PATCH] Updating version, ChangeLog and copying the most recent
 configure from ./org.glite.lb for v. 4.5.2-1

---
 org.glite.lb.yaim/configure                  | 24 ++++++++++++++++++++++++
 org.glite.lb.yaim/project/ChangeLog          | 14 ++++++++++++++
 org.glite.lb.yaim/project/version.properties |  4 ++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/org.glite.lb.yaim/configure b/org.glite.lb.yaim/configure
index 3d43cdb..89e41e1 100644
--- a/org.glite.lb.yaim/configure
+++ b/org.glite.lb.yaim/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.yaim/project/ChangeLog b/org.glite.lb.yaim/project/ChangeLog
index e8219ba..4520336 100644
--- a/org.glite.lb.yaim/project/ChangeLog
+++ b/org.glite.lb.yaim/project/ChangeLog
@@ -114,3 +114,17 @@
 4.5.1-2
 - Module rebuilt
 
+4.5.2-1
+- gLite L&B setup script:
+  - switch yaim to use the (sourced) setup script
+  - GLITE_USER, GLITE_HOST_CERT, GLITE_HOST_KEY not required
+  - GLITE_LB_LOCATION removed
+  - all defaults in the setup script now
+  - added Kerberos support (not launched by default)
+  - detect distribution and use that for the scripts
+  - configuration file in /etc/default or /etc/sysconfig
+    (replacement for the profile.d and site-info.def file)
+  - hide other startup scripts output
+  - more strict check for L&B database, migration for L&B 4
+  - update msg-config script
+
diff --git a/org.glite.lb.yaim/project/version.properties b/org.glite.lb.yaim/project/version.properties
index 0ca4c4f..4763727 100644
--- a/org.glite.lb.yaim/project/version.properties
+++ b/org.glite.lb.yaim/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=4.5.1
-module.age=2
+module.version=4.5.2
+module.age=1
-- 
1.8.2.3