From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Mon, 17 Dec 2012 16:49:50 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-lbjp-common-trio_R_2_3_5_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=78af4edde0e80bf945faa4b7fe1ee68d5b3bc17b;p=jra1mw.git

Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.3.5-1
---

diff --git a/org.glite.lbjp-common.trio/configure b/org.glite.lbjp-common.trio/configure
index b1a1d31..a024047 100755
--- a/org.glite.lbjp-common.trio/configure
+++ b/org.glite.lbjp-common.trio/configure
@@ -1940,47 +1940,47 @@ $package_description$package_summary$defprops};
 		my $used = 0;
 		my $output = '';
 
-		# build dependencies needed only for EMI <= 2
-		if ($project ne 'emi' or $project_version <= 2) {
-			for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
-				my $eext = $etics_externs{$platform}{$_};
-				my $edev = $project{etics_externs_devel}{$platform}{$_};
-
-				# for the default platform using package of the same
-				# name for runtime dependency
-				if (not $eext) {
-					if ($platform eq 'default') {
+		for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
+			my $eext = $etics_externs{$platform}{$_};
+			my $edev = $project{etics_externs_devel}{$platform}{$_};
+
+			# for the default platform using package of the same
+			# name for runtime dependency
+			if (not $eext) {
+				if ($platform eq 'default') {
 #print "default runtime $_ on default\n";
-						$eext = $_; }
-					else {
+					$eext = $_; }
+				else {
 #print "no runtime $_ on $platform\n";
-						$eext = '-'; }
-				}
-				if ($eext eq '-' and $edev eq '-') {
+					$eext = '-'; }
+			}
+			if ($eext eq '-' and $edev eq '-') {
 #print "skipping $_ on $platform\n";
-					next;
-				}
+				next;
+			}
 
-				my $proj = 'externals';
-				for my $p (keys %etics_projects) {
-					for $m (@{$etics_projects{$p}}) {
-						$proj = $p if $m eq $_;
-					}
+			my $proj = 'externals';
+			for my $p (keys %etics_projects) {
+				for $m (@{$etics_projects{$p}}) {
+					$proj = $p if $m eq $_;
 				}
+			}
+
+			# external dependencies only for EMI <= 2
+			if ($proj eq 'externals' and $project eq 'emi' and $project_version >= 3) { next; }
 
-				my $type = $need_externs_type{"$subsys.$module"}->{$_};
+			my $type = $need_externs_type{"$subsys.$module"}->{$_};
 
-				if ($edev) {
-					if ($type eq 'B') {
-						# no runtime - change to devel pkg
-						$eext = $edev;
-					} elsif ($type eq 'BR' or $type eq 'RB') {
-						# additional devel pkg
-						if ($edev ne '-') { $output .= "$proj|$edev = B\n"; }
-					}
+			if ($edev) {
+				if ($type eq 'B') {
+					# no runtime - change to devel pkg
+					$eext = $edev;
+				} elsif ($type eq 'BR' or $type eq 'RB') {
+					# additional devel pkg
+					if ($edev ne '-') { $output .= "$proj|$edev = B\n"; }
 				}
-				if ($eext ne '-') { $output .= "$proj|$eext = $type\n"; }
 			}
+			if ($eext ne '-') { $output .= "$proj|$eext = $type\n"; }
 		}
 
 		if ($platform eq 'default') {
@@ -2177,13 +2177,10 @@ sub os_type {
 	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"; }
+	elsif (/Scientific|Redhat|Centos|Fedora/i) {
+		`pkg-config --exists systemd`;
+		if ($? == 0) { return "fedora"; }
 		else { return "redhat"; }
-	} else {
-		return "redhat";
 	}
 }
 
diff --git a/org.glite.lbjp-common.trio/project/ChangeLog b/org.glite.lbjp-common.trio/project/ChangeLog
index c3d58c1..7aaacaf 100644
--- a/org.glite.lbjp-common.trio/project/ChangeLog
+++ b/org.glite.lbjp-common.trio/project/ChangeLog
@@ -120,3 +120,7 @@
 2.3.4-1
 - License and packaging fixes
 
+2.3.5-1
+- Library sonames tracked in rpm
+- Packaging cleanup when publishing to Fedora
+
diff --git a/org.glite.lbjp-common.trio/project/version.properties b/org.glite.lbjp-common.trio/project/version.properties
index 7b11248..90da004 100644
--- a/org.glite.lbjp-common.trio/project/version.properties
+++ b/org.glite.lbjp-common.trio/project/version.properties
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.lbjp-common.trio/project/version.properties,v 1.2 2009/01/21 10:44:34 zsustr Exp $
-module.version=2.3.4
+module.version=2.3.5
 module.age=1