perfsonar development work

Author: gijs
Date: 2008-06-24 06:49:42 -0400 (Tue, 24 Jun 2008)
New Revision: 4050

Added:
   trunk/packaging/rpm/example/
Removed:
   trunk/packaging/rpm/example/surfnet-java-flowsa-ma.init
Modified:
   trunk/packaging/rpm/example/surfnet-java-flowsa-ma.specs
Log:


Copied: trunk/packaging/rpm/example (from rev 4045, 
trunk/packaging/rpm/surfnet-java-flowsa-ma)

Deleted: trunk/packaging/rpm/example/surfnet-java-flowsa-ma.init

Modified: trunk/packaging/rpm/example/surfnet-java-flowsa-ma.specs
===================================================================
--- trunk/packaging/rpm/surfnet-java-flowsa-ma/surfnet-java-flowsa-ma.specs   
  2008-06-23 08:34:00 UTC (rev 4045)
+++ trunk/packaging/rpm/example/surfnet-java-flowsa-ma.specs    2008-06-24 
10:49:42 UTC (rev 4050)
@@ -12,10 +12,6 @@
 URL: http://www.perfsonar.org
 Requires: tomcat5
 Requires: nfdump
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
 BuildArch: noarch
 BuildRequires: maven2
 
@@ -28,16 +24,18 @@
 
 %prep
 %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+# setup -q will extract the tar.gz to build/ and apply any supplied patches
 %setup -q
 
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
+    # put your build command here. We use maven
     mvn package
 popd
 
 
 %install
-# make the directory
+# make the directories used for packaging. RPM_BUILD_ROOT is the virtual root
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
@@ -50,22 +48,15 @@
     %{__cp} -a  flowsama/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__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
+
+# restart tomcat, just be sure
 /sbin/service tomcat5 restart
 
 %preun
 if [ "$1" = "0" ]; then
-    ## stop service
-    /sbin/service %{name} stop
-    /sbin/chkconfig --del %{name}
     ## remove symlink
     %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
 fi
@@ -80,10 +71,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+#default file attributes
 %defattr(0644,root,tomcat,0755)
+# we use /var/run to store netflow data
 %attr(755,tomcat,tomcat) %{_var}/run/%{name}
-%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
-%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
+# configuration files should be writeable for wizard
+%attr(660,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
+# flow storage
 %attr(750,tomcat,tomcat)%{_localstatedir}/lib/%{name}
 %{prefix}
 %{_sysconfdir}/%{name}