perfsonar development work

Author: trzaszcz
Date: 2009-07-09 10:27:00 -0400 (Thu, 09 Jul 2009)
New Revision: 5219

Modified:
   trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs
Log:
change log updated


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     
2009-07-09 13:33:06 UTC (rev 5218)
+++ trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs     
2009-07-09 14:27:00 UTC (rev 5219)
@@ -1,27 +1,31 @@
-%define prefix /usr/lib/perfsonar/services/%{name}
+%define oldname geant2-java-xml-ls
+%define prefix /usr/lib/perfsonar/services/%{oldname}
 
-Name: geant2-java-xml-ls
-Version: 1.3.1
+
+Name: perfsonar-java-xml-ls
+Version: 1.4
 License: Modified BSD
 Release: 1
 Summary: perfSONAR Lookup Service
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
-packager: Maciej Glowiak 
<>
+packager: Sławomir Trzaszczka 
<>
 URL: http://www.perfsonar.org
 Requires: tomcat5
 Requires: tomcat5-exist
 BuildArch: noarch
 
+Obsoletes: geant2-java-xml-ls
+Conflicts: geant2-java-xml-ls
 
 
-
 %description
 perfSONAR Lookup Service
 
 
 
+
 %prep
 %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
 %setup -q
@@ -30,7 +34,7 @@
 
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    # no action to be done
+    #ant jar
 popd
 
 
@@ -39,23 +43,24 @@
 # make the directory
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
-%{__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}/etc/%{oldname}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}/schema
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{oldname}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}
-     %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
+#     %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
+       %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
 #pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-     %{__cp} -a doc/* ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+     %{__cp} -a doc/* ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
 #popd
 
 #pushd ${RPM_BUILD_DIR}/%{name}-%{version}
@@ -67,11 +72,11 @@
 
 %post
 ## make symlink for easy access to conf
-%{__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}
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
/etc/%{oldname}
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
/etc/%{oldname}
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml /etc/%{oldname}
+%{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{oldname}
+%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{oldname}
 
 
 
@@ -82,11 +87,11 @@
 
 %preun
 ## remove symlink
-%{__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}
+%{__rm} -rf /etc/%{oldname}/*.properties
+%{__rm} -rf /etc/%{oldname}/objects.config
+#%{__rm} -rf /etc/%{oldname}/*.xml
+%{__rm} -rf %{_var}/log/%{oldname}
+%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{oldname}
 
 %postun
 ## restart tomcat
@@ -100,19 +105,22 @@
 
 %files
 %defattr(0644,root,tomcat,0755)
-%attr(755,tomcat,tomcat) %{_var}/run/%{name}
+%attr(755,tomcat,tomcat) %{_var}/run/%{oldname}
 %attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
 %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}
-/etc/%{name}
-/usr/share/doc/%{name}
-/usr/share/doc/%{name}/schema
+/etc/%{oldname}
+/usr/share/doc/%{oldname}
+/usr/share/doc/%{oldname}/schema
 
 
 %changelog
+* Wed Jul 08 2009 Slawomir Trzaszczka 
<>
 1.4-1
+- Change:removed admin guide 
+- Change:renamed package to perfsonar-java-xml-ls
 
 * Mon Mar 16 2009 Maciej Glowiak 
<>
 1.3.1-1
 - bug fix in gLS registration