perfsonar development work

Author: gijs
Date: 2008-04-18 09:07:34 -0400 (Fri, 18 Apr 2008)
New Revision: 3731

Modified:
   branches/rpm/specs/perfsonar-tomcat6.specs
Log:


Modified: branches/rpm/specs/perfsonar-tomcat6.specs
===================================================================
--- branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-18 12:58:36 UTC (rev 
3730)
+++ branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-18 13:07:34 UTC (rev 
3731)
@@ -1,7 +1,7 @@
 Name: perfsonar-tomcat
 Version: 6.0.16
 License: Apache License, Version 2.0
-Release: 3
+Release: 5
 Summary: apache tomcat perfSONAR edition
 Source0: apache-tomcat-6.0.16.tar.gz
 Source1: perfsonar-tomcat.sh
@@ -13,10 +13,12 @@
 Requires(pre): %{_sbindir}/groupadd
 Requires(pre): %{_sbindir}/useradd
 
+%define java /usr/lib/jvm/java
 %define base /opt/perfsonar
 %define prefix %{base}/tomcat
 
 
+
 %description
 Tomcat is the servlet container that is used in the official Reference
 Implementation for the Java Servlet and JavaServer Pages technologies.
@@ -40,8 +42,8 @@
 pushd ${RPM_BUILD_DIR}
     tar zxvf ${RPM_BUILD_DIR}/apache-tomcat-%{version}/bin/jsvc.tar.gz
     pushd jsvc-src
-        sh configure --with-java=/etc/alternatives/jre
-        make
+        sh configure --with-java=%{java}
+        CFLAGS=-Wl,--hash-style=both make
     popd
 popd
 
@@ -70,9 +72,9 @@
     %{__cp} -a * ${RPM_BUILD_ROOT}%{prefix}
 popd
 
-pushd ${RPM_BUILD_DIR}/jsvc-src
-    %{__cp} jsvc ${RPM_BUILD_ROOT}%{prefix}/bin
-popd
+#pushd ${RPM_BUILD_DIR}/jsvc-src
+#    %{__cp} jsvc ${RPM_BUILD_ROOT}%{prefix}/bin
+#popd
 
 ## copy jsvc startup script
 %{__cp} %{SOURCE1}  ${RPM_BUILD_ROOT}/etc/init.d/%{name}
@@ -109,7 +111,7 @@
 
 ## bin
 %attr(755,root,perfsonar) %{prefix}/bin/*.sh
-%attr(755,root,perfsonar) %{prefix}/bin/jsvc
+#%attr(755,root,perfsonar) %{prefix}/bin/jsvc
 %{prefix}/bin/*.jar
 %{prefix}/bin/catalina-tasks.xml
 %dir %{prefix}/bin