[trademgen/el6] Upstream update

[Denis Arnaud]

commit 3df7ad3608652ef6f4e7e13e5c1503e4157e9329
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Sun Dec 23 19:56:00 2012 +0100

    Upstream update

 .gitignore     |   12 +++++++-----
 sources        |    2 +-
 trademgen.spec |   34 +++++++++++++++++++++-------------
 3 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf6cdc7..da4c9df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
-clog
-trademgen-*.tar.*
-trademgen-*.src.rpm
-.build-*.log
-/i?86/
+/trademgen-*.tar.*
+/trademgen-*.src.rpm
+/trademgen-*.*.*/
+/clog
+.build-*.*.log
+/noarch/
 /x86_64/
+/i?86/
diff --git a/sources b/sources
index 3e9f225..378267b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e05743bb6a1b2fec161c8bf7d47788d  trademgen-0.2.2.tar.bz2
+75dc0b30f363a385a031c9f40e659b14  trademgen-1.00.0.tar.bz2
diff --git a/trademgen.spec b/trademgen.spec
index 153fa90..c77fda3 100644
--- a/trademgen.spec
+++ b/trademgen.spec
@@ -2,8 +2,8 @@
 %global mydocs __tmp_docdir
 #
 Name:           trademgen
-Version:        0.2.2
-Release:        2%{?dist}
+Version:        1.00.0
+Release:        1%{?dist}
 
 Summary:        C++ Simulated Travel Demand Generation Library
 
@@ -13,13 +13,10 @@ URL:            http://sourceforge.net/projects/%{name}/
 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:  stdair-devel
+BuildRequires:  cmake, python26-devel
+BuildRequires:  boost141-devel, soci-mysql-devel, zeromq-devel, readline-devel
+BuildRequires:  stdair-devel, sevmgr-devel
 
-# That patch comes from upstream, in order to fix the build on EPEL 5/6:
-# https://github.com/airsim/trademgen/commit/0994bc000d74b01b6b8001d349373cb3580f4e50
-Patch0:         trademgen-fix-cmake-python-finder.patch
 
 %description
 %{name} aims at providing a clean API, and the corresponding C++
@@ -63,18 +60,22 @@ online (http://%{name}.org).
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %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
-
-# Remove extra libraries, which are generated only for the tests
-rm -f $RPM_BUILD_ROOT%{_libdir}/libsequential_generation*.so*
+popd
 
 #
 mkdir -p %{mydocs}
@@ -82,7 +83,9 @@ 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
@@ -97,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
 %{_bindir}/%{name}_with_db
+%{_bindir}/%{name}_generateDemand
 %{_bindir}/py%{name}
 %{_bindir}/%{name}_drawBookingArrivals
 %{_bindir}/%{name}_extractBookingRequests
@@ -104,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpy%{name}.so.*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/man1/%{name}_with_db.1.*
+%{_mandir}/man1/%{name}_generateDemand.1.*
 %{_mandir}/man1/py%{name}.1.*
 %{_mandir}/man1/%{name}_drawBookingArrivals.1.*
 %{_mandir}/man1/%{name}_extractBookingRequests.1.*
@@ -128,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 23 2012 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.00.0-1
+- Upstream update
+
 * Thu Dec 15 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.2.2-2
 - Patch to fix the build on EPEL 6.