Updating version, ChangeLog and copying the most recent configure from ./org.glite...

diff --git a/org.glite.px.myproxy-yaim/configure b/org.glite.px.myproxy-yaim/configure
index b1a1d31..a024047 100755 (executable)
--- a/org.glite.px.myproxy-yaim/configure
+++ b/org.glite.px.myproxy-yaim/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.px.myproxy-yaim/project/ChangeLog b/org.glite.px.myproxy-yaim/project/ChangeLog
index 44a589f..6337d24 100644 (file)
--- a/org.glite.px.myproxy-yaim/project/ChangeLog
+++ b/org.glite.px.myproxy-yaim/project/ChangeLog
@@ -55,3 +55,6 @@
 4.1.9-1
 - License and packaging fixes
 
+4.1.10-1
+- Packaging fixes
+

diff --git a/org.glite.px.myproxy-yaim/project/version.properties b/org.glite.px.myproxy-yaim/project/version.properties
index 0ebd976..cffbba5 100644 (file)
--- a/org.glite.px.myproxy-yaim/project/version.properties
+++ b/org.glite.px.myproxy-yaim/project/version.properties
@@ -1,2 +1,2 @@
-module.version=4.1.9
+module.version=4.1.10
 module.age=1