[simcrs/el5] Adapted the RPM specification file to EPEL 5.

Denis Arnaud denisarnaud at fedoraproject.org
Wed Dec 26 09:09:11 UTC 2012


commit be0e9384cdc818c887652ef7290b8094056441a0
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Wed Dec 26 10:09:03 2012 +0100

    Adapted the RPM specification file to EPEL 5.

 simcrs.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/simcrs.spec b/simcrs.spec
index f13998d..a2acb59 100644
--- a/simcrs.spec
+++ b/simcrs.spec
@@ -13,8 +13,9 @@ URL:            http://%{name}.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  cmake, python-devel
-BuildRequires:  boost-devel, soci-mysql-devel, zeromq-devel, readline-devel
+BuildRequires:  cmake, python26-devel
+BuildRequires:  boost141-devel, soci-mysql-devel, zeromq-devel
+BuildRequires:  readline-devel, ncurses-devel
 BuildRequires:  stdair-devel, airsched-devel, simfqt-devel, sevmgr-devel
 BuildRequires:  airrac-devel, rmol-devel, airinv-devel
 
@@ -65,19 +66,28 @@ online (http://%{name}.org).
 
 
 %build
-%cmake .
+mkdir -p build
+pushd build
+%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost141 \
+ -DBOOST_INCLUDEDIR=%{_includedir}/boost141 \
+ -DBoost_ADDITIONAL_VERSIONS="1.41 1.41.0" ..
 make %{?_smp_mflags}
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 mkdir -p %{mydocs}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
 rm -f %{mydocs}/html/installdox
 
 %check
+pushd build
 #ctest
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT


More information about the scm-commits mailing list