perfsonar development work

Author: gijs
Date: 2008-06-20 08:45:47 -0400 (Fri, 20 Jun 2008)
New Revision: 4033

Modified:
   trunk/packaging/rpm/geant2-java-rrd-ma/geant2-java-rrd-ma.specs
   trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.init
   trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.specs
   
trunk/packaging/rpm/surfnet-java-flowsubscription-mp/surfnet-java-flowsubscription-mp.specs
Log:


Modified: trunk/packaging/rpm/geant2-java-rrd-ma/geant2-java-rrd-ma.specs
===================================================================
--- trunk/packaging/rpm/geant2-java-rrd-ma/geant2-java-rrd-ma.specs     
2008-06-20 11:53:32 UTC (rev 4032)
+++ trunk/packaging/rpm/geant2-java-rrd-ma/geant2-java-rrd-ma.specs     
2008-06-20 12:45:47 UTC (rev 4033)
@@ -1,7 +1,7 @@
 %define prefix /var/lib/tomcat5/webapps/%{name}
 
 Name: geant2-java-rrd-ma
-Version: 3.0
+Version: 3.1
 License: GPL
 Release: 1
 Summary: perfSONAR Round Robin Database Measurement Archive
@@ -33,7 +33,7 @@
 
     # build the libs
     pushd contrib/rrdjtool/native
-        make
+        make -f Makefile.linux
     popd
 popd
 

Modified: 
trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.init
===================================================================
--- trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.init    
  2008-06-20 11:53:32 UTC (rev 4032)
+++ trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.init    
  2008-06-20 12:45:47 UTC (rev 4033)
@@ -9,7 +9,7 @@
 
 
 ## where is the service.properties file located
-CONF=/etc/surfnet_java-flowsa-ma/service.properties
+CONF=/etc/surfnet-java-flowsa-ma/service.properties
 
 # source function library
 [ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
@@ -18,7 +18,7 @@
 [ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 
 # pull in sysconfig settings
-[ -f /etc/sysconfig/surfnet_java-flowsa-ma ] && . 
/etc/sysconfig/surfnet_java-flowsa-ma
+[ -f /etc/sysconfig/surfnet-java-flowsa-ma ] && . 
/etc/sysconfig/surfnet-java-flowsa-ma
 
 
 if [[ ! -f $CONF ]]; then
@@ -55,7 +55,7 @@
 # get nfcapd storage location
 STORAGE=`grep ^service\.ma\.flowsa\.nfdump\.source $CONF | cut -f 2 -d =`
 if [ ! -d $STORAGE ] || [ -z $STORAGE ]; then
-       log_failure_msg "ERROR: nfdump.source folder doesn't exists 
($RUNFOLDER)"
+       log_failure_msg "ERROR: nfdump.source folder doesn't exists 
($STORAGE)"
        exit 1;
 fi
 

Modified: 
trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.specs
===================================================================
--- trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.specs   
  2008-06-20 11:53:32 UTC (rev 4032)
+++ trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.specs   
  2008-06-20 12:45:47 UTC (rev 4033)
@@ -1,9 +1,9 @@
 %define prefix /var/lib/tomcat5/webapps/%{name}
 
-Name: surfnet_java-flowsa-ma
-Version: 0.2
+Name: surfnet-java-flowsa-ma
+Version: 0.3
 License: GPL
-Release: 2
+Release: 1
 Summary: perfSONAR flow selection and aggregation Measurement Archive
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -51,13 +51,14 @@
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__cp} contrib/%{name}.rc ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
+    %{__cp} ${RPM_SOURCE_DIR}/%{name}.init 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
 popd
 
 %post
 ## make symlink for easy access to conf
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
 /sbin/chkconfig --add %{name}
+/sbin/chkconfig %{name} off
 /sbin/service tomcat5 restart
 
 %preun
@@ -88,7 +89,10 @@
 %{_sysconfdir}/%{name}
 
 %changelog
-* Tue May 20 2008 Gijs Molenaar 
<>
 0.2-1
+* Fri Jun 20 2008 Gijs Molenaar 
<>
 0.3-1
+- New upstream release
+
+* Tue May 20 2008 Gijs Molenaar 
<>
 0.2-2
 - Changed to new filesystem layout
 
 * Wed Apr 23 2008 Gijs Molenaar 
<>
 0.2-1

Modified: 
trunk/packaging/rpm/surfnet-java-flowsubscription-mp/surfnet-java-flowsubscription-mp.specs
===================================================================
--- 
trunk/packaging/rpm/surfnet-java-flowsubscription-mp/surfnet-java-flowsubscription-mp.specs
 2008-06-20 11:53:32 UTC (rev 4032)
+++ 
trunk/packaging/rpm/surfnet-java-flowsubscription-mp/surfnet-java-flowsubscription-mp.specs
 2008-06-20 12:45:47 UTC (rev 4033)
@@ -1,7 +1,7 @@
 %define prefix /var/lib/tomcat5/webapps/%{name}
 
-Name: surfnet_java-flowsubscription-mp
-Version: 0.1
+Name: surfnet-java-flowsubscription-mp
+Version: 0.2
 License: GPL
 Release: 1
 Summary: perfSONAR flow subscription Measurement Point
@@ -40,7 +40,7 @@
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  flowsubscription-mp/* ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a  surfnet_java-flowsubscription-mp/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Fri Jun 20 2008 Gijs Molenaar 
<>
 0.2-1
+- new upstream release
+
 * Fri Apr 20 2008 Gijs Molenaar 
<>
 0.1-1
 - first release