perfsonar development work

Author: roman
Date: 2008-12-15 09:43:50 -0500 (Mon, 15 Dec 2008)
New Revision: 4785

Modified:
   trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
Log:
problem with upgrading the package fixed


Modified: trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2008-12-15 14:31:49 UTC (rev 4784)
+++ trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2008-12-15 14:43:50 UTC (rev 4785)
@@ -67,12 +67,12 @@
 
 %post
 ## make symlink for easy access to conf
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{name}
-%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
 
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -81,11 +81,13 @@
 
 %preun
 ## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
-%{__rm} -rf %{_var}/log/%{name}
-%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
+if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties ]; then
+  %{__rm} -rf %{_sysconfdir}/%{name}/*.properties || true
+  %{__rm} -rf %{_sysconfdir}/%{name}/objects.config || true
+  %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
+  %{__rm} -rf %{_var}/log/%{name} || true
+  %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+fi