perfsonar development work

Author: psnc.pikusa
Date: 2010-03-04 17:00:12 +0000 (Thu, 04 Mar 2010)
New Revision: 5527

Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
Log:


Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
   2010-03-04 16:11:56 UTC (rev 5526)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
   2010-03-04 17:00:12 UTC (rev 5527)
@@ -80,7 +80,7 @@
 %{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
 %{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
 %{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
-rm -rf %{_var}/lib/tomcat5/webapps/%{oldname}
+rm -rf /var/lib/tomcat5/webapps/%{oldname}
 rm -rf %{_sysconfdir}/%{oldname}
 rm -rf /usr/share/doc/%{oldname}
 
@@ -93,8 +93,9 @@
 ## remove symlink
 if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/configuration.xml ]; then
   %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
-  %{__rm} -rf %{_var}/log/%{name} || true
-  %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+  %{__rm} -rf%{prefix}/WEB-INF/log
+  %{__rm} -rf /var/log/%{name} || true
+  %{__rm} -rf /var}/lib/tomcat5/webapps/%{name} || true
 fi
 
 
@@ -116,10 +117,10 @@
 %attr(755,tomcat,tomcat) %{_var}/run/%{name}
 %attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
-%{prefix}
 %{_sysconfdir}/%{name}
 /usr/share/doc/%{name}
 /usr/share/doc/%{name}/schema
+%{prefix}