perfsonar development work

Author: pikusa
Date: 2009-07-10 10:04:05 -0400 (Fri, 10 Jul 2009)
New Revision: 5223

Modified:
   trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
Log:
rpm build script update for package transition according to change naming 
policy

Modified: trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2009-07-10 10:40:58 UTC (rev 5222)
+++ trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs     
2009-07-10 14:04:05 UTC (rev 5223)
@@ -1,10 +1,11 @@
 
-%define prefix /usr/lib/perfsonar/services/%{name}
+%define oldname geant2-java-sql-ma
+%define prefix /usr/lib/perfsonar/services/%{oldname}
 
-Name: geant2-java-sql-ma
-Version: 2.1.1
+Name: perfsonar-java-sql-ma
+Version: 2.2
 License: Modified BSD
-Release: 5
+Release: 1
 Summary: perfSONAR Relational Database Service
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -13,10 +14,14 @@
 URL: http://www.perfsonar.org
 Requires: tomcat5-exist
 BuildArch: noarch
-%BuildRequires: maven2
+#BuildRequires: maven2
 
+Obsoletes: geant2-java-sql-ma
+Conflicts: geant2-java-sql-ma
 
 
+
+
 %description
 perfSONAR Relational Database Service
 
@@ -39,9 +44,9 @@
 # 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
@@ -51,11 +56,11 @@
 
 # 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
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
@@ -67,13 +72,13 @@
 
 %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/*.sql 
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_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/*.sql 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_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
@@ -83,12 +88,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}/*.sql || 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}/*.sql || true
+  %{__rm} -rf %{_var}/log/%{oldname} || true
+  %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{oldname} || true
 fi
 
 
@@ -111,9 +116,9 @@
 %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}
-/usr/share/doc/%{name}
-/usr/share/doc/%{name}/schema
+%{_sysconfdir}/%{oldname}
+/usr/share/doc/%{oldname}
+/usr/share/doc/%{oldname}/schema