perfsonar development work

Author: pikusa
Date: 2009-07-09 06:43:46 -0400 (Thu, 09 Jul 2009)
New Revision: 5215

Modified:
   trunk/geant2-java-rrd-ma/doc/ChangeLog.txt
   trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
Log:
specss changes to prepare it for rename process

Modified: trunk/geant2-java-rrd-ma/doc/ChangeLog.txt
===================================================================
--- trunk/geant2-java-rrd-ma/doc/ChangeLog.txt  2009-07-08 13:51:28 UTC (rev 
5214)
+++ trunk/geant2-java-rrd-ma/doc/ChangeLog.txt  2009-07-09 10:43:46 UTC (rev 
5215)
@@ -1,5 +1,10 @@
 RRD MA ChangeLog
 
+2009-07-08 Piotr Pikusa 
<>
 3.2-1
+- Change: Renamed package to perfsonar-java-rrd-ma
+- Change: Removed Web Admin Guide from doc directory
+
+
 2009-03-04 Version 3.1.1
 
 - Fixed Bug #724: wrong paths of log files

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     
2009-07-08 13:51:28 UTC (rev 5214)
+++ trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs     
2009-07-09 10:43:46 UTC (rev 5215)
@@ -1,20 +1,24 @@
-%define prefix /usr/lib/perfsonar/services/%{name}
+%define oldname geant2-java-rrd-ma
+%define prefix /usr/lib/perfsonar/services/%{oldname}
 
-Name: geant2-java-rrd-ma
-Version: 3.1.1
+Name: perfsonar-java-rrd-ma
+Version: 3.2
 License: Modified BSD
 Release: 1
 Summary: perfSONAR Round Robin Database
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
-packager: Roman Lapacz 
<>
+packager: Piotr Pikusa 
<>
 URL: http://www.perfsonar.org
 Requires: tomcat5-exist
 Requires: rrdjtool
 BuildArch: noarch
-BuildRequires: maven2
+#BuildRequires: maven2
 
+# Forces to remove the renamed package
+Obsoletes: geant2-java-rrd-ma
+Conflicts: geant2-java-rrd-ma
 
 
 %description
@@ -39,26 +43,26 @@
 # 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}/usr/share/doc/%{name}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{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}%{prefix}/WEB-INF/samples/rrd
 %{__install} -d -m 755 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_conf
-%{__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}/%{name}-%{version}/build
-    %{__cp} -a  %{name}/* ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a  %{oldname}/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
 popd
 
 
@@ -75,12 +79,12 @@
 
 %post
 ## make symlink for easy access to conf
-%{__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}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.rng 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{oldname}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{oldname}
 
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -90,12 +94,12 @@
 %preun
 ## remove symlink
 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
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/*.properties || true
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/objects.config || true
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/*.xml || true
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/*.rng || true
+  %{__rm} -rf %{_var}/log/%{oldname} || true
+  %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{oldname} || true
 fi
 
 
@@ -114,20 +118,28 @@
 
 %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
 %{prefix}
-%{_sysconfdir}/%{name}
-/usr/share/doc/%{name}
-/usr/share/doc/%{name}/schema
+%{_sysconfdir}/%{oldname}
+/usr/share/doc/%{oldname}
+/usr/share/doc/%{oldname}/schema
 
 
 
 
 %changelog
+* Wed Jul 08 2009 Piotr Pikusa 
<>
 3.2-1
+- Change: Renamed package to perfsonar-java-rrd-ma
+- Change: Removed Web Admin Guide from doc directory
+
+* Wed Jul 08 2009 Piotr Pikusa 
<>
 3.1.2-1
+- Change: Renamed package to perfsonar-java-rrd-ma
+- Change: Removed Web Admin Guide from doc directory
+
 * Wed Mar 04 2009 Roman Lapacz 
<>
 3.1.1-1
 - Fixed Bug #724: wrong paths of log files