perfsonar development work

Author: psnc.pikusa
Date: 2010-03-05 15:52:47 +0000 (Fri, 05 Mar 2010)
New Revision: 5528

Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
Log:
rpm packaging script update because some files were not removed properly in 
unisnstall procedure. Also there was a bad link in perfsonar-java-rrd-ma 
directory wich made recurency to itself

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 17:00:12 UTC (rev 5527)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
   2010-03-05 15:52:47 UTC (rev 5528)
@@ -1,10 +1,11 @@
 %define prefix /usr/lib/perfsonar/services/%{name}
+%define perfix_no_name /usr/lib/perfsonar/services/
 %define oldname geant2-java-rrd-ma
 
 Name: perfsonar-java-rrd-ma
 Version: 3.3
 License: Modified BSD
-Release: 1
+Release: rc1
 Summary: perfSONAR Round Robin Database
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -56,7 +57,7 @@
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  %{name}/* ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a  %{name} ${RPM_BUILD_ROOT}%{perfix_no_name}
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
@@ -80,9 +81,9 @@
 %{__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 %{_sysconfdir}/%{oldname}
-rm -rf /usr/share/doc/%{oldname}
+rm -rf /var/lib/tomcat5/webapps/%{oldname} || true
+rm -rf %{_sysconfdir}/%{oldname} || true
+rm -rf /usr/share/doc/%{oldname} || true
 
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -91,15 +92,14 @@
 
 %preun
 ## remove symlink
-if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/configuration.xml ]; then
-  %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
-  %{__rm} -rf%{prefix}/WEB-INF/log
-  %{__rm} -rf /var/log/%{name} || true
-  %{__rm} -rf /var}/lib/tomcat5/webapps/%{name} || true
-fi
+rm -rf %{_sysconfdir}/%{name}/*.xml || true
+rm -rf %{prefix}/WEB-INF/log ||true
+rm -rf /var/log/%{name} || true
+rm -rf /var/lib/tomcat5/webapps/%{name} || true
 
 
 
+
 %postun
 ## restart tomcat
 /sbin/service tomcat5 restart