From fbb48907450b933f27e8aaf9420d62202eeac1b8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Sat, 19 Jan 2013 09:25:50 +0000
Subject: [PATCH] Updating version, ChangeLog and copying the most recent
 configure from ./org.glite.lb for v. 3.0.4-1

---
 org.glite.lb.server/configure                  |  8 ++++----
 org.glite.lb.server/project/ChangeLog          | 14 ++++++++++++++
 org.glite.lb.server/project/version.properties |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure
index a024047..b6b28e5 100755
--- a/org.glite.lb.server/configure
+++ b/org.glite.lb.server/configure
@@ -2003,12 +2003,12 @@ $output};
 	close C;
 
 	for $file ("$cvs_module/project/debian.rules", "$cvs_module/project/$packageName.spec") {
-		my $lib;
+		my ($lib, $pkg_prefix);
 		my $main_module;
 		@copts = ();
 
-		if ($file =~ /debian\.rules$/) { $lib = 'lib'; }
-		else { $lib = '%{_lib}'; }
+		if ($file =~ /debian\.rules$/) { $lib = 'lib'; $pkg_prefix = "$project{local_prefix}"; }
+		else { $lib = '%{_lib}'; $pkg_prefix = '%{_prefix}'; }
 
 		my $main_module = "$subsys.$module";
 		if (exists $subpackages{$main_module}) { $main_module = $subpackages{$main_module}; }
@@ -2027,7 +2027,7 @@ $output};
 			while (<SRC>) {
 				if (/^(\s*).+\/configure\s/) {
 					printf DST "%s", "$1";
-					printf DST "/usr/bin/perl $confdir/configure $project{flavours} --root=/ --prefix=$project{local_prefix} --libdir=$lib --project=$project --module $main_module@copts\n";
+					printf DST "/usr/bin/perl $confdir/configure $project{flavours} --root=/ --prefix=$pkg_prefix --libdir=$lib --project=$project --module $main_module@copts\n";
 				} else {
 					printf DST "%s", "$_";
 				}
diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog
index e3759a5..bfbb53e 100644
--- a/org.glite.lb.server/project/ChangeLog
+++ b/org.glite.lb.server/project/ChangeLog
@@ -574,3 +574,17 @@
 3.0.3-1
 - Change home directory of glite user to be compliant with FHS (finalize SB #98940)
 - Update dump and purge locations, updates for (unused) mill
+
+3.0.4-1
+- EMIR URL example updated
+- LCAS removed -- rotating LCAS log not needed
+- Less aggressive EMIR setup
+  - Using directory for service files
+  - Separate daemon configuration and generating service info
+  - Integration with YAIM EMIR set-up not supported yet
+- Missing /var/log/glite directory fixed
+- Legacy build scripts updated
+- VM job type querying
+- Bugfix in match_status (several missed breaks in switch on condition attributes)
+- Changes based on Fedora reviews
+
diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties
index c5c6585..81a1fd5 100644
--- a/org.glite.lb.server/project/version.properties
+++ b/org.glite.lb.server/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.lb.server/project/version.properties,v 1.185 2008/06/25 13:12:58 akrenek Exp $
-module.version=3.0.3
+module.version=3.0.4
 module.age=1
-- 
1.8.2.3