Changes from tagging.
authorZdeněk Šustr <sustr4@cesnet.cz>
Wed, 23 Feb 2011 13:17:40 +0000 (13:17 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Wed, 23 Feb 2011 13:17:40 +0000 (13:17 +0000)
org.glite.jobid.api-c/configure
org.glite.jobid.api-c/project/ChangeLog
org.glite.jobid.api-c/project/version.properties
org.glite.jobid.api-cpp/configure
org.glite.jobid.api-cpp/project/ChangeLog
org.glite.jobid.api-cpp/project/version.properties

index 3258454..8b63779 100755 (executable)
@@ -50,6 +50,9 @@ my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db
 my %enable_nodes;
 my %disable_nodes;
 
+# key:      internal package name (arguments, ...)
+# 'pkg':    pkg-config name
+# 'prefix': used when pkg-config fails
 my %externs = (
        cares => {
                prefix => '/opt/c-ares',
@@ -71,15 +74,18 @@ my %externs = (
                prefix=> '/opt/globus',
                pkg => 'globus-gssapi-gsi'
        },
-       'myproxy-essentials' => {
+       'myproxy-devel' => {
                prefix=> '/opt/globus',
                pkg => 'myproxy'
        },
        'myproxy-server' => {
-               prefix=> '/opt/globus',
+               prefix=> '',
        },
-       'myproxy-client' => {
-               prefix=> '/opt/globus',
+       'myproxy-libs' => {
+               prefix=> '',
+       },
+       'myproxy-admin' => {
+               prefix=> '',
        },
        gsoap => {
                prefix=> '/usr',
@@ -446,10 +452,10 @@ BEGIN{
         'jp.server-common' => [],
         'jp.ws-interface' => [],
        'gridsite.core' => [qw/httpd-devel:B gsoap:B globus:B/ ],
-       'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-essentials voms/ ],
+       'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B myproxy-libs:R voms/ ],
        'px.glite-PX' => [qw/myproxy-server:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/],
        'px.myproxy-yaim' => [ qw/yaim_core:R/ ],
-       'px.myproxy-config' => [ qw/myproxy-client:R/ ], # in myproxy-config.spec
+       'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
 );
 
 for my $ext (keys %need_externs_aux) {
@@ -707,9 +713,10 @@ BEGIN{
        %etics_externs = (
                globus_essentials=>'vdt_globus_essentials',
                globus=>'globus',
-               'myproxy-essentials'=>'myproxy_essentials',
-               'myproxy-server'=>'myproxy_server',
-               'myproxy-client'=>'myproxy_client',
+               'myproxy-devel'=>'myproxy-devel',
+               'myproxy-libs'=>'myproxy-libs',
+               'myproxy-server'=>'myproxy-server',
+               'myproxy-admin'=>'myproxy-admin',
                cares=>'c-ares',
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
@@ -736,8 +743,8 @@ BEGIN{
                yaim_core=>'emi.yaim.yaim-core'
        );
        %etics_projects = (
-               vdt=>[qw/globus globus_essentials myproxy/],
-               'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
+               vdt=>[qw/globus globus_essentials gpt/],
+               'org.glite'=>[qw/voms gridsite lcas gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
        );
        %etics_projects_emi = (
                vdt=>'externs',
index fe42417..6962bc6 100644 (file)
@@ -33,3 +33,6 @@
 2.0.0-1
 - Version numbering fixed
 
+2.0.0-2
+- Module rebuilt
+
index 06295c4..9ed3545 100644 (file)
@@ -1,3 +1,3 @@
 # : /cvs/jra1mw/org.glite.jobid.api-c/project/version.properties,v 1.1 2009/01/16 08:48:52 zsustr Exp $
 module.version=2.0.0
-module.age=1
+module.age=2
index 3258454..8b63779 100755 (executable)
@@ -50,6 +50,9 @@ my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db
 my %enable_nodes;
 my %disable_nodes;
 
+# key:      internal package name (arguments, ...)
+# 'pkg':    pkg-config name
+# 'prefix': used when pkg-config fails
 my %externs = (
        cares => {
                prefix => '/opt/c-ares',
@@ -71,15 +74,18 @@ my %externs = (
                prefix=> '/opt/globus',
                pkg => 'globus-gssapi-gsi'
        },
-       'myproxy-essentials' => {
+       'myproxy-devel' => {
                prefix=> '/opt/globus',
                pkg => 'myproxy'
        },
        'myproxy-server' => {
-               prefix=> '/opt/globus',
+               prefix=> '',
        },
-       'myproxy-client' => {
-               prefix=> '/opt/globus',
+       'myproxy-libs' => {
+               prefix=> '',
+       },
+       'myproxy-admin' => {
+               prefix=> '',
        },
        gsoap => {
                prefix=> '/usr',
@@ -446,10 +452,10 @@ BEGIN{
         'jp.server-common' => [],
         'jp.ws-interface' => [],
        'gridsite.core' => [qw/httpd-devel:B gsoap:B globus:B/ ],
-       'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-essentials voms/ ],
+       'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B myproxy-libs:R voms/ ],
        'px.glite-PX' => [qw/myproxy-server:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/],
        'px.myproxy-yaim' => [ qw/yaim_core:R/ ],
-       'px.myproxy-config' => [ qw/myproxy-client:R/ ], # in myproxy-config.spec
+       'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
 );
 
 for my $ext (keys %need_externs_aux) {
@@ -707,9 +713,10 @@ BEGIN{
        %etics_externs = (
                globus_essentials=>'vdt_globus_essentials',
                globus=>'globus',
-               'myproxy-essentials'=>'myproxy_essentials',
-               'myproxy-server'=>'myproxy_server',
-               'myproxy-client'=>'myproxy_client',
+               'myproxy-devel'=>'myproxy-devel',
+               'myproxy-libs'=>'myproxy-libs',
+               'myproxy-server'=>'myproxy-server',
+               'myproxy-admin'=>'myproxy-admin',
                cares=>'c-ares',
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
@@ -736,8 +743,8 @@ BEGIN{
                yaim_core=>'emi.yaim.yaim-core'
        );
        %etics_projects = (
-               vdt=>[qw/globus globus_essentials myproxy/],
-               'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
+               vdt=>[qw/globus globus_essentials gpt/],
+               'org.glite'=>[qw/voms gridsite lcas gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
        );
        %etics_projects_emi = (
                vdt=>'externs',
index e6cf578..991ea63 100644 (file)
@@ -23,3 +23,6 @@
 1.1.0-1
 - Fixes for parallel release in EMI & gLite
 
+1.1.0-2
+- Module rebuilt
+
index 84735e4..f8a76b9 100644 (file)
@@ -1,3 +1,3 @@
 # : /cvs/glite/org.glite.jobid.api-cpp/project/version.properties,v 1.1 2009/01/16 08:48:52 zsustr Exp $
 module.version=1.1.0
-module.age=1
+module.age=2