perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-13 14:02:16 +0100 (Thu, 13 May 2010)
New Revision: 5631

Modified:
   trunk/perfsonar-java-xml-ls/packaging/deb/changelog
   trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
Log:


Modified: trunk/perfsonar-java-xml-ls/packaging/deb/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/changelog 2010-05-13 11:16:37 
UTC (rev 5630)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/changelog 2010-05-13 13:02:16 
UTC (rev 5631)
@@ -1,7 +1,7 @@
 perfsonar-java-xml-ls (1.5-0RC3) stable; urgency=low
   
   * Fixes: bugs fixes
- -- Slawomir Trzaszczka 
<>
  Thu, 23 Apr 2010 10:00:00 +0200
+ -- Slawomir Trzaszczka 
<>
  Thu, 13 May 2010 10:00:00 +0200
 
 perfsonar-java-xml-ls (1.5-0RC2) stable; urgency=low
   

Modified: 
trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-13 11:16:37 UTC (rev 5630)
+++ trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-13 13:02:16 UTC (rev 5631)
@@ -81,15 +81,26 @@
 
 %preun
 ## 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
+
+if [ $1 -eq 1 ]; then
+       ## upgrade - do nothing
+else
+       ## remove - cleanup
+       if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/configuration.xml 
]; then
+         %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
+         %{__rm} -rf %{_var}/log/%{name} || true
+       fi
+       if [  -e %{_var}/lib/tomcat5/webapps/%{name} ]; then
+               %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+       fi
+       if [  -e %{_var}/lib/tomcat5/webapps/%{old_name} ]; then
+               %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{old_name} || true
+       fi
 fi
-if [  -e %{_var}/lib/tomcat5/webapps/%{name} ]; then
-       %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
-fi
 
 
+
+
 %postun
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -116,7 +127,7 @@
 
 
 %changelog
-* Thu Apr 29 2010 Slawomir Trzaszczka 
<>
 1.5-RC3
+* Thu May 13 2010 Slawomir Trzaszczka 
<>
 1.5-RC3
 - Fixes: bugs fixes
 
 * Thu Mar 18 2010 Slawomir Trzaszczka 
<>
 1.5-RC2