perfsonar development work

Author: psnc.pikusa
Date: 2010-09-13 15:18:37 +0100 (Mon, 13 Sep 2010)
New Revision: 5746

Modified:
   trunk/geant2-java-sql-ma/packaging/package.sh
   trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
Log:
Update files for 2.2-1 version

Modified: trunk/geant2-java-sql-ma/packaging/package.sh
===================================================================
--- trunk/geant2-java-sql-ma/packaging/package.sh       2010-09-08 14:41:05 
UTC (rev 5745)
+++ trunk/geant2-java-sql-ma/packaging/package.sh       2010-09-13 14:18:37 
UTC (rev 5746)
@@ -4,11 +4,12 @@
 #update: Piotr Pikusa 
<>
 
 CURR_DIR=$(pwd)
-RPM_VERSION="3.3"
-RPM_SPEC_NAME="ps-mdm-rrd-ma.specs"
+RPM_VERSION="2.2"
+RPM_SPEC_NAME="geant2-java-sql-ma.specs"
 
 SERVICE_NAME="geant2-java-sql-ma"
 OLD_NAME="perfsonar-java-sql-ma"
+PACKAGE_NAME="perfsonar-java-sql-ma"
 
 
 do_clean_up() {
@@ -115,23 +116,23 @@
        mkdir temp/rpm
        mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}    
        echo "[ ] Create temp structure for tgz source file"
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION/build
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION/doc
-       mkdir temp/$SERVICE_NAME-$RPM_VERSION/samples
-       cp -vr ../build/* temp/$SERVICE_NAME-$RPM_VERSION/build
-       cp -vr ../doc/* temp/$SERVICE_NAME-$RPM_VERSION/doc
-       cp -vr ../samples/* temp/$SERVICE_NAME-$RPM_VERSION/samples
+       mkdir temp/$PACKAGE_NAME-$RPM_VERSION
+       mkdir temp/$PACKAGE_NAME-$RPM_VERSION/build
+       mkdir temp/$PACKAGE_NAME-$RPM_VERSION/doc
+       mkdir temp/$PACKAGE_NAME-$RPM_VERSION/samples
+       cp -vr ../build/* temp/$PACKAGE_NAME-$RPM_VERSION/build
+       cp -vr ../doc/* temp/$PACKAGE_NAME-$RPM_VERSION/doc
+       cp -vr ../samples/* temp/$PACKAGE_NAME-$RPM_VERSION/samples
        
        echo "[ ] TAR"
        cd temp
-       tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
+       tar -czhf $PACKAGE_NAME-$RPM_VERSION.tar.gz $PACKAGE_NAME-$RPM_VERSION
        cd ..   
        echo "[ ] Copy tarball into SOURCES"
        pwd
-       mv -v temp/$SERVICE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
-       rm -rf temp/$SERVICE_NAME-$RPM_VERSION
-       rm -rf temp/$SERVICE_NAME-$RPM_VERSION.tar.gz
+       mv -v temp/$PACKAGE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
+       rm -rf temp/$PACKAGE_NAME-$RPM_VERSION
+       rm -rf temp/$PACKAGE_NAME-$RPM_VERSION.tar.gz
 
        echo "[ ] Copy RPM .specs file"
        cp -v rpm/$RPM_SPEC_NAME temp/rpm/rpmbuild/
@@ -189,7 +190,7 @@
        do_structure
         do_rpm_struct
         build_rpm_package
-        cleanup_after_rpm_packaging
+        #cleanup_after_rpm_packaging
         ;;
     *)
         echo "Usage: $0 clean|deb|rpm" >&2

Modified: trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2010-09-08 14:41:05 UTC (rev 5745)
+++ trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2010-09-13 14:18:37 UTC (rev 5746)
@@ -5,14 +5,17 @@
 Name: perfsonar-java-sql-ma
 Version: 2.2
 License: Modified BSD
-Release: 1
+Release: 2
 Summary: perfSONAR Relational Database Service
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
 packager: Piotr Pikusa 
<>
 URL: http://www.perfsonar.org
-Requires: tomcat5-exist
+Requires: jre >= 1.6
+Requires: tomcat5
+Requires: exist
+Requires: rrdjtool
 BuildArch: noarch
 #BuildRequires: maven2
 
@@ -35,7 +38,7 @@
 
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    mvn package
+    #mvn package
 popd
 
 
@@ -80,12 +83,13 @@
 %{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{oldname}
 %{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{oldname}
 
-%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/var/lib/tomcat5/common/endorsed/
-%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/var/lib/tomcat5/common/endorsed/
-%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/var/lib/tomcat5/common/endorsed/
-%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/var/lib/tomcat5/common/endorsed/
-%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/var/lib/tomcat5/common/endorsed/
 
+#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/var/#lib/tomcat5/common/endorsed/
+#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/#var/lib/tomcat5/common/endorsed/
+#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/var/lib/#tomcat5/common/endorsed/
+#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/#var/lib/tomcat5/common/endorsed/
+#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/var/lib/#tomcat5/common/endorsed/
+
 ## restart tomcat
 /sbin/service tomcat5 restart
 
@@ -129,6 +133,10 @@
 
 
 %changelog
+* Tue Aug 07 2010 Piotr Pikusa 
<>
 2.2-1
+- Removed installation text guides
+- Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available 
+
 * Tue Jul 07 2009 Piotr Pikusa 
<>
 2.2
 - Removed installation text guides
 - Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available 
on https://anonsvn.internet2.edu/svn/perfsonar/trunk/perfsonar-doc/manuals/