perfsonar development work

Author: gijs
Date: 2008-05-29 10:14:30 -0400 (Thu, 29 May 2008)
New Revision: 3920

Modified:
   trunk/packaging/rpm/geant2_java-rrd-ma/geant2_java-rrd-ma.specs
Log:


Modified: trunk/packaging/rpm/geant2_java-rrd-ma/geant2_java-rrd-ma.specs
===================================================================
--- trunk/packaging/rpm/geant2_java-rrd-ma/geant2_java-rrd-ma.specs     
2008-05-29 13:29:07 UTC (rev 3919)
+++ trunk/packaging/rpm/geant2_java-rrd-ma/geant2_java-rrd-ma.specs     
2008-05-29 14:14:30 UTC (rev 3920)
@@ -1,18 +1,21 @@
 %define prefix /var/lib/tomcat5/webapps/%{name}
 
 Name: geant2_java-rrd-ma
-Version: 3.1
+Version: 3.1.RC1
 License: GPL
 Release: 1
 Summary: perfSONAR Round Robin Database Measurement Archive
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
-packager: Gijs Molenaar 
<>
+packager: Roman Lapacz 
<>
 URL: http://www.perfsonar.org
 Requires: tomcat5
-BuildArch: noarch
+Requires: tomcat5-exist
+Requires: rrdtool
+BuildArch: i386
 BuildRequires: maven2
+BuildRequires: rrdtool-devel
 
 
 %description
@@ -27,6 +30,11 @@
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
     mvn package
+
+    # build the libs
+    pushd contrib/rrdjtool/native
+        make
+    popd
 popd
 
 
@@ -35,13 +43,20 @@
 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/lib
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  flowsubscription-mp/* ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a rrd-ma/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
+# copy build library to correct place
+%{__cp} contrib/rrdjtool/build/libjrrd.so ${RPM_BUILD_ROOT}/usr/lib
 
+# remove stupid debug folder
+%{__rm} -rf ${RPM_BUILD_ROOT}/usr/lib/debug
+
+
 %post
 ## make symlink for easy access to conf
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
@@ -69,9 +84,10 @@
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
 %{prefix}
 %{_sysconfdir}/%{name}
+%attr(644,root,root) /usr/lib/libjrrd.so
 
 
 %changelog
-* Fri Apr 20 2008 Gijs Molenaar 
<>
 3.1-1
+* Thu May 29 2008 Roman Lapacz 
<>
 3.1.RC1
 - first release