perfsonar development work

Author: roman
Date: 2008-12-12 10:05:48 -0500 (Fri, 12 Dec 2008)
New Revision: 4778

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



Modified: trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs     
2008-12-11 14:05:27 UTC (rev 4777)
+++ trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs     
2008-12-12 15:05:48 UTC (rev 4778)
@@ -75,16 +75,13 @@
 
 %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/perfsonar/conf/*.rng 
%{_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/perfsonar/conf/*.rng 
%{_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
 
@@ -92,12 +89,14 @@
 
 %preun
 ## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
-%{__rm} -rf %{_sysconfdir}/%{name}/*.rng
-%{__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 %{_sysconfdir}/%{name}/*.rng || true
+  %{__rm} -rf %{_var}/log/%{name} || true
+  %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+fi