perfsonar development work

Author: gijs
Date: 2008-04-18 10:40:28 -0400 (Fri, 18 Apr 2008)
New Revision: 3733

Modified:
   branches/rpm/specs/perfsonar-tomcat6.specs
Log:
added hash-style option to LDFLAGS for jsvc so the resulting binary can run 
on old distro's like centos4


Modified: branches/rpm/specs/perfsonar-tomcat6.specs
===================================================================
--- branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-18 13:23:23 UTC (rev 
3732)
+++ branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-18 14:40:28 UTC (rev 
3733)
@@ -42,8 +42,9 @@
 pushd ${RPM_BUILD_DIR}
     tar zxvf ${RPM_BUILD_DIR}/apache-tomcat-%{version}/bin/jsvc.tar.gz
     pushd jsvc-src
+        export LDFLAGS="-Wl,--hash-style=sysv"
         sh configure --with-java=%{java}
-        CFLAGS=-Wl,--hash-style=both make
+       make
     popd
 popd
 
@@ -72,9 +73,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}
@@ -111,7 +112,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
@@ -150,6 +151,10 @@
 %attr(755,root,root) /etc/init.d/%{name}
 
 %changelog
+* Fri Apr 18 2008 Gijs Molenaar 
<>
 6.0.14-5
+- set linking options to hash-style=sysv so old distro's can install
+  this RPM
+
 * Tue Apr 15 2008 Gijs Molenaar 
<>
 6.0.14-3
 - improved startup script and moved to /etc/init.d