perfsonar development work

Author: fernandes
Date: 2008-04-16 11:06:33 -0400 (Wed, 16 Apr 2008)
New Revision: 3712

Modified:
   branches/rpm/package_maker.pl
Log:
Modified so it works with new ant targets from Roman (which have webapps 
directory without version number)

Modified: branches/rpm/package_maker.pl
===================================================================
--- branches/rpm/package_maker.pl       2008-04-16 15:04:51 UTC (rev 3711)
+++ branches/rpm/package_maker.pl       2008-04-16 15:06:33 UTC (rev 3712)
@@ -21,6 +21,7 @@
 my $serviceDependencies;
 my $serviceArch = 'noarch';
 my $packageType;
+my $serviceDirectory;
 my @serviceDescription;
 my @serviceMessage;
 my @directoryListing;
@@ -273,8 +274,14 @@
 }
        
 sub getFilesListing(){
-       if(!chdir("webapps/$serviceName-$serviceVersion")){
-               print "Couldn't change directories to 
webapps/$serviceName-$serviceVersion.\n";
+       if(-d "webapps/$serviceName-$serviceVersion"){
+               $serviceDirectory = "$serviceName-$serviceVersion";
+       }else{
+               $serviceDirectory = "$serviceName";
+       }
+       
+       if(!chdir("webapps/$serviceDirectory")){
+               print "Couldn't change directories to 
webapps/$serviceDirectory.\n";
         print "Are you sure you have the right setup? Check build-guide for 
more information.\n";
         exit;
        }
@@ -381,7 +388,7 @@
        print "\%{__install} -d -m 755 \${RPM_BUILD_ROOT}\%{prefix}\n";
        print "# copy the service content to the tomcat webapps directory\n";
        print "pushd \${RPM_BUILD_DIR}/\%{name}-\%{version}\n";
-    print "    \%{__cp} -a  $serviceName-\%{version}/* 
\${RPM_BUILD_ROOT}\%{prefix}\n";
+    print "    \%{__cp} -a  $serviceDirectory/* 
\${RPM_BUILD_ROOT}\%{prefix}\n";
        print "popd\n";
     print "\n";
     print "\%post\n";