perfsonar development work

Author: gijs
Date: 2008-05-20 09:59:25 -0400 (Tue, 20 May 2008)
New Revision: 3865

Added:
   trunk/packaging/rpm/surfnet_java-flowsa-ma/
   trunk/packaging/rpm/surfnet_java-flowsubscription-mp/
   
trunk/packaging/rpm/surfnet_java-flowsubscription-mp/surfnet_java-flowsubscription-mp.specs
Removed:
   trunk/packaging/rpm/surfnet_java-rrd-ma/
Modified:
   trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs
   trunk/packaging/rpm/tomcat5.5-exist-1.1.1/tomcat5.5-exist.specs
Log:


Copied: trunk/packaging/rpm/surfnet_java-flowsa-ma (from rev 3864, 
trunk/packaging/rpm/surfnet_java-rrd-ma)

Modified: 
trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs
===================================================================
--- trunk/packaging/rpm/surfnet_java-rrd-ma/surfnet_java-flowsa-ma.specs      
  2008-05-20 13:34:20 UTC (rev 3864)
+++ trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs   
  2008-05-20 13:59:25 UTC (rev 3865)
@@ -1,10 +1,9 @@
-%define base /opt/perfsonar
-%define prefix %{base}/services/%{name}
+%define prefix /var/lib/tomcat5/webapps/%{name}
 
 Name: surfnet_java-flowsa-ma
 Version: 0.2
 License: GPL
-Release: 1
+Release: 2
 Summary: PERFsonar flow selection and aggregation Measurement Archive
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -52,7 +51,6 @@
 
 %post
 ## make symlink so service shows up in tomcat
-%{__ln_s} %{prefix} %{base}/tomcat/webapps/%{name}
 ## make symlink for easy access to conf
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
 
@@ -60,7 +58,6 @@
 ## stop service
 /etc/init.d/surfnet_java-flowsa-ma stop
 ## remove symlink
-%{__rm} -rf %{base}/tomcat/webapps/%{name}
 %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
 
 
@@ -70,14 +67,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,perfsonar,0755)
-%attr(755,perfsonar,perfsonar) %{_var}/run/%{name}
+%defattr(0644,root,tomcat,0755)
+%attr(755,tomcat,tomcat) %{_var}/run/%{name}
 %attr(755,root,root) %{_sysconfdir}/init.d/%{name}
-%attr(640,perfsonar,perfsonar) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
-%attr(750,perfsonar,perfsonar)%{_localstatedir}/lib/%{name}
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
+%attr(750,tomcat,tomcat)%{_localstatedir}/lib/%{name}
 %{prefix}
 %{_sysconfdir}/%{name}
 
+* Tue May 20 2008 Gijs Molenaar 
<>
 0.2-1
+- Changed to new filesystem layout
 
 * Wed Apr 23 2008 Gijs Molenaar 
<>
 0.2-1
 - Improved default config

Added: 
trunk/packaging/rpm/surfnet_java-flowsubscription-mp/surfnet_java-flowsubscription-mp.specs

Modified: trunk/packaging/rpm/tomcat5.5-exist-1.1.1/tomcat5.5-exist.specs
===================================================================
--- trunk/packaging/rpm/tomcat5.5-exist-1.1.1/tomcat5.5-exist.specs     
2008-05-20 13:34:20 UTC (rev 3864)
+++ trunk/packaging/rpm/tomcat5.5-exist-1.1.1/tomcat5.5-exist.specs     
2008-05-20 13:59:25 UTC (rev 3865)
@@ -1,18 +1,17 @@
 
-%define base /opt/perfsonar
-%define prefix %{base}/services/exist
+%define prefix /var/lib/tomcat5/webapps/exist
 
-Name: perfsonar-exist
+Name: tomcat5-exist
 Version: 1.1.1
 License: GNU LGPL 2.1
-Release: 3
+Release: 4
 Summary: tomcat exist perfSONAR edition
-BuildRoot: %{_tmppath}/perfsonar-exist-%{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
 packager: Gijs Molenaar 
<>
 URL: http://www.perfsonar.org
 BuildArch: noarch
-Requires: perfsonar-tomcat >= 6.0.16-5
+Requires: tomcat5
 
 %description
 Open Source Native XML Database for Java
@@ -36,23 +35,22 @@
 touch ${RPM_BUILD_ROOT}/%{prefix}/WEB-INF/TMPfile.xml
 
 %post
-## make symlink so service shows up in tomcat
-%{__ln_s} %{base}/services/exist %{base}/tomcat/webapps/exist
 
 %preun
-## remove symlink
-%{__rm} -rf %{base}/tomcat/webapps/exist
 
 
 %files
-%defattr(0644,root,perfsonar,0755)
-%attr(770,root,perfsonar) %{prefix}/WEB-INF/logs
-%attr(770,root,perfsonar) %{prefix}/WEB-INF/data
-%attr(660,root,perfsonar) %{prefix}/WEB-INF/TMPfile.xml
+%defattr(0644,root,tomcat,0755)
+%attr(770,root,tomcat) %{prefix}/WEB-INF/logs
+%attr(770,root,tomcat) %{prefix}/WEB-INF/data
+%attr(660,root,tomcat) %{prefix}/WEB-INF/TMPfile.xml
 %{prefix}
 
 
 %changelog
+* Tue May 16 2008 Gijs Molenaar 
<>
 1.1.1-4
+- Changed to new structure
+
 * Tue May 06 2008 Gijs Molenaar 
<>
 1.1.1-3
 - Added empty TMPfile.xml in WEB-INF with 660 root:perfsonar perms so exist 
will start correctly