From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Thu, 12 May 2011 14:29:26 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-px-proxyrenewal_R_1_3_20_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=107ef45150cb8544a46838e1c97f7d1a40d45168;p=jra1mw.git

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

diff --git a/org.glite.px.proxyrenewal/configure b/org.glite.px.proxyrenewal/configure
index aace459..0e0c292 100755
--- a/org.glite.px.proxyrenewal/configure
+++ b/org.glite.px.proxyrenewal/configure
@@ -560,7 +560,7 @@ BEGIN{
 	'gridsite.services' => [ qw/curl:R gsoap:R/ ],
 	'gridsite.service-clients' => [ qw/curl:R gsoap:R gsoapxx:R/ ],
 	'gridsite.gsexec' => [ qw// ],
-	'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B myproxy-libs:R voms libtool:R/ ],
+	'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B myproxy-libs:R voms libtool:B/ ],
 	'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
 );
 
@@ -720,10 +720,11 @@ for my $ext (keys %deps_aux) {
 );
 
 %conflicts = (
-	'lb.glite-LB' => [ qq/emi-lb/ ],
-	'px.glite-PX' => [ qq/emi-px/ ],
-	'lb.emi-lb' => [ qq/glite-LB/ ],
-	'px.emi-px' => [ qq/glite-PX/ ],
+);
+
+%provides = (
+	'lbjp-common.gss' => [ qq/glite-security-gss/ ],
+	'lbjp-common.gsoap-plugin' => [ qq/glite-security-gsoap-plugin/ ],
 );
 
 %cvs_prefix = (
@@ -819,7 +820,6 @@ for my $ext (keys %deps_aux) {
 			gridsite=>'emi.gridsite.shared',
 			yaim_core=>'emi.yaim.yaim-core',
 			yaim_bdii=>'emi.bdii.yaim-bdii',
-			gip_release=>'emi.bdii.glite-info-provider-release',
 			gip_service=>'emi.bdii.glite-info-provider-service',
 			bdii=>'emi.bdii.core',
 			glite_version=>'emi.misc.glite-version',
@@ -849,11 +849,11 @@ for my $ext (keys %deps_aux) {
 			jdk=>'java-devel',
 		},
 		etics_projects => {
-			'emi'=>[qw/voms voms-devel gridsite lcas gip_release gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/],
+			'emi'=>[qw/voms voms-devel gridsite lcas gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/],
 		},
 		need_externs_aux => {
 			'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager trustmanager_axis libtool:B/ ],
-			'lb.glite-LB' => [ qw/fetchcrl:R gip_release:R gip_service:R bdii:R glite_version:R glue_schema:R/ ],
+			'lb.glite-LB' => [ qw/fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R/ ],
 			'lb.yaim' => [ qw/yaim_core:R yaim_bdii:R perl-LDAP:R/ ],
 			'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R/],
 			'px.myproxy-yaim' => [ qw/yaim_core:R yaim_bdii:R/ ],
@@ -1133,18 +1133,18 @@ sub mode_etics {
 
 			if ($project ne 'glite') {
 				$flags = 'RELEASE_VERSION=${age}.${platformFamily} libdir=${libdir} GSOAPDIR=`pkg-config gsoap --variable=prefix` OPENSSL_GLOBUS_FLAGS=`pkg-config globus-openssl --cflags` OPENSSL_GLOBUS_LIBS=`pkg-config globus-openssl --libs` FLAVOR_GLOBUS_EXT= HTTPD_FLAGS="-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-${aprSuffix} -I/usr/include/pcre"';
-				$prefix = "prefix=${prefix}/usr";
+				$prefix = 'prefix=${prefix}/usr';
 			} else {
 				$flags = 'RELEASE_VERSION=${age}.${platformFamily} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"';
-				$prefix = "prefix=${prefix}";
+				$prefix = 'prefix=${prefix}';
 			}
 
 			$cmd{compile} = "echo 'make $flags' > build.sh\n\tmake $flags build";
 			$cmd{clean} = "rm -rvf build.sh; $cmd{clean}";
 			$cmd{install} = "make $prefix $flags install";
-			$cmd{packaging} = "mkdir ${moduleDir}/src/tgz
+			$cmd{packaging} = "mkdir \${moduleDir}/RPMTMP/SOURCES \${moduleDir}/src/tgz
 	make $prefix $flags rpm && \
-	cp ${moduleDir}/RPMTMP/SOURCES/gridsite-${version}.src.tar.gz ${moduleDir}/src/tgz";
+	cp \${moduleDir}/RPMTMP/SOURCES/gridsite-\${version}.src.tar.gz \${moduleDir}/src/tgz";
 		}
 		else {
 			$cmd{clean} = 'None';
@@ -1222,6 +1222,9 @@ $package_description$package_summary$defprops};
 	for (@{$conflicts{"$subsys.$module"}}) {
 		print C "package.conflicts = $_\n";
 	}
+	for (@{$provides{"$subsys.$module"}}) {
+		print C "package.provides = $_\n";
+	}
 
 	for my $pp (keys %{$platform_properties{"$subsys.$module"}}) {
 		next if $pp eq 'default';
diff --git a/org.glite.px.proxyrenewal/project/ChangeLog b/org.glite.px.proxyrenewal/project/ChangeLog
index 7f050dc..cca76bc 100644
--- a/org.glite.px.proxyrenewal/project/ChangeLog
+++ b/org.glite.px.proxyrenewal/project/ChangeLog
@@ -36,3 +36,8 @@
 
 1.3.19-1
 - using rpath only as $prefix/$libdir (fixes rpmlint rpath check in mock environment)
+
+1.3.20-1
+- Proper sysconf (ETICS will relocate $PREFIX to /opt/glite for gLite)
+- Logging output adjusted for clarity
+
diff --git a/org.glite.px.proxyrenewal/project/version.properties b/org.glite.px.proxyrenewal/project/version.properties
index 77f3274..405bb3c 100644
--- a/org.glite.px.proxyrenewal/project/version.properties
+++ b/org.glite.px.proxyrenewal/project/version.properties
@@ -1,2 +1,2 @@
-module.version=1.3.19
+module.version=1.3.20
 module.age=1