Upstream update

This commit is contained in:
Denis Arnaud 2012-12-22 20:15:35 +01:00
parent e66e67d311
commit 937538a45f
3 changed files with 31 additions and 12 deletions

14
.gitignore vendored
View File

@ -1,6 +1,10 @@
clog /stdair-*.tar.*
stdair-*.tar.* /stdair-*.src.rpm
stdair-*.rpm /stdair-*.*.*/
.build-*.log /clog
/i?86/ .build-*.*.log
/noarch/
/x86_64/ /x86_64/
/i?86/

View File

@ -1 +1 @@
352197cdeac7763a828d0308c805e188 stdair-0.45.0.tar.bz2 c83888fb38db03b8f96837709492f761 stdair-1.00.0.tar.bz2

View File

@ -2,8 +2,8 @@
%global mydocs __tmp_docdir %global mydocs __tmp_docdir
# #
Name: stdair Name: stdair
Version: 0.45.0 Version: 1.00.0
Release: 3%{?dist} Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library Summary: C++ Standard Airline IT Object Library
@ -16,9 +16,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: cmake, python26-devel BuildRequires: cmake, python26-devel
BuildRequires: boost141-devel, soci-mysql-devel, zeromq-devel, readline-devel BuildRequires: boost141-devel, soci-mysql-devel, zeromq-devel, readline-devel
# The following patch comes from upstream: it is therefore already fixed in next version:
# https://github.com/airsim/stdair/commit/c33edce960715d13f9c1208882fa2cba0aa38fa3
Patch0: stdair-fix-boost-test-build.patch
%description %description
%{name} aims at providing a clean API, and the corresponding C++ %{name} aims at providing a clean API, and the corresponding C++
@ -61,7 +58,6 @@ online (http://%{name}.org).
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
mkdir -p build mkdir -p build
@ -112,10 +108,26 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/%{name}/db/data %dir %{_datadir}/%{name}/db/data
%dir %{_datadir}/%{name}/samples %dir %{_datadir}/%{name}/samples
%dir %{_datadir}/%{name}/samples/rds01 %dir %{_datadir}/%{name}/samples/rds01
%dir %{_datadir}/%{name}/samples/HybridForecasting
%dir %{_datadir}/%{name}/samples/IBP_study
%dir %{_datadir}/%{name}/samples/NewQFF
%dir %{_datadir}/%{name}/samples/NewQFF/instance01
%dir %{_datadir}/%{name}/samples/NewQFF/instance02
%dir %{_datadir}/%{name}/samples/OldQFF
%dir %{_datadir}/%{name}/samples/OldQFF/instance01
%dir %{_datadir}/%{name}/samples/OldQFF/instance02
%dir %{_datadir}/%{name}/samples/QForecasting
%{_datadir}/%{name}/db/data/*.sql %{_datadir}/%{name}/db/data/*.sql
%{_datadir}/%{name}/db/data/*.csv %{_datadir}/%{name}/db/data/*.csv
%{_datadir}/%{name}/samples/*.csv %{_datadir}/%{name}/samples/*.csv
%{_datadir}/%{name}/samples/rds01/*.csv %{_datadir}/%{name}/samples/rds01/*.csv
%{_datadir}/%{name}/samples/HybridForecasting/*.csv
%{_datadir}/%{name}/samples/IBP_study/*.csv
%{_datadir}/%{name}/samples/NewQFF/instance01/*.csv
%{_datadir}/%{name}/samples/NewQFF/instance02/*.csv
%{_datadir}/%{name}/samples/OldQFF/instance01/*.csv
%{_datadir}/%{name}/samples/OldQFF/instance02/*.csv
%{_datadir}/%{name}/samples/QForecasting/*.csv
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -136,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Dec 22 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-1
- Upstream update
* Sat Dec 17 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.45.0-3 * Sat Dec 17 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.45.0-3
- StdAir now uses Boost-1.41 and Python-2.6 on EPEL 4 and 5 - StdAir now uses Boost-1.41 and Python-2.6 on EPEL 4 and 5