perfsonar development work

Author: gijs
Date: 2008-04-23 09:26:11 -0400 (Wed, 23 Apr 2008)
New Revision: 3781

Modified:
   branches/rpm/specs/perfsonar-exist.specs
   branches/rpm/specs/perfsonar-tomcat.sh
   branches/rpm/specs/perfsonar-tomcat6.specs
Log:


Modified: branches/rpm/specs/perfsonar-exist.specs
===================================================================
--- branches/rpm/specs/perfsonar-exist.specs    2008-04-23 12:04:44 UTC (rev 
3780)
+++ branches/rpm/specs/perfsonar-exist.specs    2008-04-23 13:26:11 UTC (rev 
3781)
@@ -5,7 +5,7 @@
 Name: perfsonar-exist
 Version: 1.1.1
 License: GNU LGPL 2.1
-Release: 1
+Release: 2
 Summary: tomcat exist perfSONAR edition
 BuildRoot: %{_tmppath}/perfsonar-exist-%{version}-%{release}
 Group: Network/Web service
@@ -15,7 +15,7 @@
 Requires: perfsonar-tomcat
 
 %description
-bla bla bla
+Open Source Native XML Database for Java
 
 
 %prep
@@ -50,4 +50,14 @@
 
 %files
 %defattr(0644,root,perfsonar,0755)
+%attr(770,root,perfsonar) %{prefix}/WEB-INF/logs
+%attr(770,root,perfsonar) %{prefix}/WEB-INF/data
 %{prefix}
+
+
+%changelog
+* Wed Apr 23 2008 Gijs Molenaar 
<>
 1.1.1-2
+- changed permissions of logs / data folder 
+
+* Fri Apr 11 2008 Gijs Molenaar 
<>
 1.1.1-1
+- first release

Modified: branches/rpm/specs/perfsonar-tomcat.sh
===================================================================
--- branches/rpm/specs/perfsonar-tomcat.sh      2008-04-23 12:04:44 UTC (rev 
3780)
+++ branches/rpm/specs/perfsonar-tomcat.sh      2008-04-23 13:26:11 UTC (rev 
3781)
@@ -1,9 +1,8 @@
 #!/bin/sh
 #
-# /etc/init.d/perfsonar-tomcat -- startup script for the PerfSONAR Tomcat 
servlet engine
+# chkconfig: 345 91 19
+# description: Start/stop the perfsonar tomcat servlet engine
 #
-# written by Gijs Molenaar 
<>
-#
 
 set -e
 

Modified: branches/rpm/specs/perfsonar-tomcat6.specs
===================================================================
--- branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-23 12:04:44 UTC (rev 
3780)
+++ branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-23 13:26:11 UTC (rev 
3781)
@@ -1,7 +1,7 @@
 Name: perfsonar-tomcat
 Version: 6.0.16
 License: Apache License, Version 2.0
-Release: 5
+Release: 6
 Summary: apache tomcat perfSONAR edition
 Source0: apache-tomcat-6.0.16.tar.gz
 Source1: perfsonar-tomcat.sh
@@ -84,6 +84,7 @@
     pushd bin
         %{__rm} *.bat
         %{__rm} *.exe
+        %{__rm} *.sh
         %{__rm} jsvc.tar.gz
         %{__rm} tomcat-native.tar.gz
     popd
@@ -94,6 +95,7 @@
         %{__rm} -rf docs
         %{__rm} -rf examples
         %{__rm} -rf host-manager
+        %{__rm} -rf ROOT
     popd
 
     %{__mkdir} doc
@@ -109,7 +111,6 @@
 %defattr(0644,root,perfsonar,0755)
 
 ## bin
-%attr(755,root,perfsonar) %{prefix}/bin/*.sh
 %attr(755,root,perfsonar) %{prefix}/bin/jsvc
 %{prefix}/bin/*.jar
 %{prefix}/bin/catalina-tasks.xml
@@ -149,6 +150,12 @@
 %attr(755,root,root) /etc/init.d/%{name}
 
 %changelog
+* Wed Apr 23 2008 Gijs Molenaar 
<>
 6.0.14-6
+- Changed shutdown procedure at deinstall
+- Modified startup script so it supports chkconfig
+- Removed start page
+- Removed other startup scripts
+
 * Fri Apr 18 2008 Gijs Molenaar 
<>
 6.0.14-5
 - set linking options to hash-style=sysv so old distro's can install
   this RPM