[Mobies-commit] [commit] r3957 - in UDM/trunk: . rpm

[endre at redhat1.isis.vanderbilt.edu]

Author: endre
Date: Mon Nov 21 03:53:29 2011
New Revision: 3957

Log:
Updated Linux build instructions to make clear that the RHEL instructions apply to CentOS too.

Also updated the original rpm spec:
- removed unneeded loki-lib-devel BR

Modified:
   UDM/trunk/Linux_build.txt
   UDM/trunk/rpm/udm.spec.in

Modified: UDM/trunk/Linux_build.txt
==============================================================================
--- UDM/trunk/Linux_build.txt	Mon Nov 21 03:52:08 2011	(r3956)
+++ UDM/trunk/Linux_build.txt	Mon Nov 21 03:53:29 2011	(r3957)
@@ -16,16 +16,15 @@
 - junit
 - Boost
 
-Build-environment preparation (Fedora 11, 12):
+Build-environment preparation (Fedora 14 or newer):
 ----------------------------------------------
 - install development tools and libraries
   yum groupinstall 'Development Libraries' 'Development Tools' 'Java Development'
-  yum install ccache cppunit-devel swig xalan-c-devel xerces-c-devel
+  yum install ccache cppunit-devel minizip-devel swig xalan-c-devel xerces-c-devel
   yum install ant ant-junit ant-trax junit xerces-j2 xalan-j2 xml-commons-apis
-- install the following rpms from our repository:
-  minizip, minizip-devel, minizip-libs, pccts
+- install the following rpm from our repository or disable antlr: pccts
 
-Build-environment preparation (RHEL 5):
+Build-environment preparation (RHEL/CentOS 5):
 ----------------------------------------------
 - enable EPEL repository: http://fedoraproject.org/wiki/EPEL
 - install development tools and libraries
@@ -49,7 +48,7 @@
   model-files.zip; save the archive in the top directory of your build
   directory
 - configure and build Udm with the usual sequence of steps for GNU autotools:
-  ./configure  (for RHEL and Fedora: ./configure --with-antlr=antlr1)
+  ./configure  (for RHEL/CentOS and Fedora: ./configure --with-antlr=antlr1)
   make
 - to run the tests launch the following command in the top build directory:
   make check

Modified: UDM/trunk/rpm/udm.spec.in
==============================================================================
--- UDM/trunk/rpm/udm.spec.in	Mon Nov 21 03:52:08 2011	(r3956)
+++ UDM/trunk/rpm/udm.spec.in	Mon Nov 21 03:53:29 2011	(r3957)
@@ -16,7 +16,6 @@
 BuildRequires: ant, ant-junit, ant-trax, junit, xml-commons-apis
 BuildRequires: java-devel
 BuildRequires: boost-devel
-BuildRequires: loki-lib-devel
 Requires: xerces-c, xalan-c, minizip-libs
 %if "%{rhldisttag}" == "rh7"
 BuildRequires: gcc3-c++
@@ -83,7 +82,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java
 for sample in GeneTF GeneTRE SBML2Ex TimeSeries; do
     install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java/$sample
-    cp -pr judm/build/build_linux/$sample/{apidoc,*.jar,meta,runtests.sh,samples,src} $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java/$sample
+    cp -pr judm/build/build_linux/$sample/{apidoc,*.jar,meta,runtests.sh,samples} $RPM_BUILD_ROOT%{_datadir}/%{name}/samples/java/$sample
 done
 
 %postun