perfsonar development work

Author: mac
Date: 2008-11-28 09:55:08 -0500 (Fri, 28 Nov 2008)
New Revision: 4718

Modified:
   trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs
Log:
RC11
bug 680 fixed



Modified: trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs
===================================================================
--- trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs     
2008-11-28 14:54:06 UTC (rev 4717)
+++ trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs     
2008-11-28 14:55:08 UTC (rev 4718)
@@ -39,7 +39,7 @@
 # make the directory
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/etc/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
@@ -67,9 +67,9 @@
 
 %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/*.properties /etc/%{name}
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
/etc/%{name}
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml /etc/%{name}
 %{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{name}
 %{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
 
@@ -82,9 +82,9 @@
 
 %preun
 ## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-#%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
+%{__rm} -rf /etc/%{name}/*.properties
+%{__rm} -rf /etc/%{name}/objects.config
+#%{__rm} -rf /etc/%{name}/*.xml
 %{__rm} -rf %{_var}/log/%{name}
 %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
 
@@ -107,13 +107,21 @@
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
 #%attr(640,tomcat,tomcat) %config(noreplace) %{prefix}/WEB-INF/classes/*.xml
 %{prefix}
-%{_sysconfdir}/%{name}
+/etc/%{name}
 /usr/share/doc/%{name}
 /usr/share/doc/%{name}/schema
 
 
 %changelog
 
+
+* Fri Nov 28 2008 Maciej Glowiak 
<>
 1.3-10
+- Fixes bugs 649, 690, 685, 680
+- Change: nmwg-jar=nmwg-1.0.20081015.jar
+- Change: ps-antxml-ver=1.0.20080204
+- Change: ps-jar-ver=1.0.20080924
+- Change: ps-webadmin=0.9.8b
+
 * Fri Oct 31 2008 Maciej Glowiak 
<>
 1.3-10
 - Change: Webadmin deployment test works
 - Fixes in scripts