perfsonar development work

Author: trzaszcz
Date: 2009-12-15 09:47:19 -0500 (Tue, 15 Dec 2009)
New Revision: 5421

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf
   branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh
   
branches/new-structure-with-base2/ps-mdm-ls/packaging/rpm/perfsonar-java-xml-ls.specs
Log:
rpm packaging enhancement

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf  
2009-12-15 14:44:54 UTC (rev 5420)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf  
2009-12-15 14:47:19 UTC (rev 5421)
@@ -5,7 +5,7 @@
 #
 # important for correct build of RPM package ! (must be the same as in .spec 
file)
 
-RPM_VERSION="1.4.1"
+RPM_VERSION="2.0"
 
 SERVICE_NAME="perfsonar-java-xml-ls"
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh    
2009-12-15 14:44:54 UTC (rev 5420)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh    
2009-12-15 14:47:19 UTC (rev 5421)
@@ -130,7 +130,7 @@
 build_rpm_package() {
        echo " CREATE RPM PACKAGE"
        cd rpm
-       sudo rpmbuild -bb rpmbuild/$SERVICE_NAME.specs
+       rpmbuild -bb rpmbuild/$SERVICE_NAME.specs
        echo
        echo 
 }
@@ -140,10 +140,10 @@
 #
 cleanup_after_rpm_packaging(){
        cd ../..
-       file=$(find temp/rpm/rpmbuld/RPMS/noarch -regex ".+\.rpm$")
+       file=$(find temp/rpm/rpmbuild/RPMS/noarch -regex ".+\.rpm$")
        mkdir target
        cp $file target
-       sudo rm -rf temp 
+       rm -rf temp 
        echo
        echo 
 }

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/packaging/rpm/perfsonar-java-xml-ls.specs
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/packaging/rpm/perfsonar-java-xml-ls.specs
       2009-12-15 14:44:54 UTC (rev 5420)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/packaging/rpm/perfsonar-java-xml-ls.specs
       2009-12-15 14:47:19 UTC (rev 5421)
@@ -49,7 +49,7 @@
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}
-    %{__cp} -a  %{name}/* ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc