- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

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

sources

@@ -1 +1 @@
-352197cdeac7763a828d0308c805e188  stdair-0.45.0.tar.bz2
+SHA512 (stdair-1.00.8.tar.gz) = 216aa0d0c4a0f5ce19b3456051593313c7e913e7a704eb15fa178390e48fc5fdc6631149a4beb04cba379f2ba628d6bde85007d686242d00a7f77b958ac4168b

stdair-fix-boost-test-build.patch

@@ -1,19 +0,0 @@
-diff --git a/test/stdair/StandardAirlineITTestSuite.cpp b/test/stdair/StandardAirlineITTestSuite.cpp
-index 8889740..65ab573 100644
---- a/test/stdair/StandardAirlineITTestSuite.cpp
-+++ b/test/stdair/StandardAirlineITTestSuite.cpp
-@@ -122,12 +122,12 @@ BOOST_AUTO_TEST_CASE (mpl_structure_test) {
-   
-   if (boost::is_same<stdair_test::BookingClass,
-                      stdair_test::Cabin::child>::value == false) {
--    BOOST_REQUIRE ("The two types mut be equal, but are not");
-+    BOOST_ERROR ("The two types mut be equal, but are not");
-   }
-   
-   if (boost::is_same<boost::mpl::at_c<types, 1>::type,
-                      stdair_test::Cabin>::value == false) {
--    BOOST_REQUIRE ("The type must be stdair_test::Cabin, but is not");
-+    BOOST_ERROR ("The type must be stdair_test::Cabin, but is not");
-   }
- }
- 

stdair.spec

@@ -1,24 +1,22 @@
-#
 %global mydocs __tmp_docdir
-#
 Name:           stdair
-Version:        0.45.0
-Release:        3%{?dist}
+Version:        1.00.8
+Release:        2%{?dist}
 
 Summary:        C++ Standard Airline IT Object Library
 
-Group:          System Environment/Libraries 
 License:        LGPLv2+
-URL:            http://%{name}.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+URL:            http://github.com/airsim/%{name}
+Source0:        %{url}/archive/%{name}-%{version}.tar.gz
+BuildRequires:  gcc-c++
+BuildRequires:  cmake
+BuildRequires:  python3-devel
+BuildRequires:  boost-devel
+BuildRequires:  boost-python3-devel
+BuildRequires:  soci-mysql-devel
+BuildRequires:  soci-sqlite3-devel
+BuildRequires:  readline-devel
 
-BuildRequires:  cmake, python-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
 %{name} aims at providing a clean API, and the corresponding C++
@@ -34,10 +32,12 @@ modeling, mainly for simulation purpose.
 
 %package        devel
 Summary:        Header files, libraries and development helper tools for %{name}
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
+# The cmake files have Python version backed in them
+Requires:       (python(abi) = %{python3_version} if python3-devel)
+
 %description    devel
 This package contains the header files, shared libraries and
 development helper tools for %{name}. If you would like to develop
@@ -45,12 +45,10 @@ programs using %{name}, you will need to install %{name}-devel.
 
 %package        doc
 Summary:        HTML documentation for the %{name} library
-Group:          Documentation
-%if 0%{?fedora} || 0%{?rhel} > 5
 BuildArch:      noarch
-%endif
 BuildRequires:  tex(latex)
-BuildRequires:  doxygen, ghostscript
+BuildRequires:  doxygen
+BuildRequires:  ghostscript
 
 %description    doc
 This package contains HTML pages, as well as a PDF reference manual,
@@ -60,47 +58,31 @@ online (http://%{name}.org).
 
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -n %{name}-%{name}-%{version} 
 
 %build
-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
+%cmake .
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-pushd build
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
+%make_install
 
 # Fix some permissions
 find $RPM_BUILD_ROOT%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \;
 
 mkdir -p %{mydocs}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html %{mydocs}
 rm -f %{mydocs}/html/installdox
 
+# Remove additional documentation files (those files are already available
+# in the project top directory)
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README.md,AUTHORS}
+
 %check
-pushd build
-#ctest
-popd
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
+ctest
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc ChangeLog COPYING AUTHORS NEWS README.md
 %{_bindir}/%{name}
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/lib%{name}uicl.so.*
@@ -112,13 +94,28 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/db/data
 %dir %{_datadir}/%{name}/samples
 %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/*.csv
 %{_datadir}/%{name}/samples/*.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
-%defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_bindir}/%{name}-config
 %{_libdir}/lib%{name}.so
@@ -130,12 +127,296 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}-library.3.*
 
 %files doc
-%defattr(-,root,root,-)
 %doc %{mydocs}/html
 %doc COPYING
 
 
 %changelog
-* Sat Dec 17 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.45.0-3
-- New package for EPEL 4
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 11 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.8-1
+- CMake support files updated for Python 3.8
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 24 2019 Jonathan Wakely <jwakely@redhat.com> - 1.00.7-3
+- Rebuilt for Boost 1.69
+
+* Thu Jan 17 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.7-2
+- Fixed a typo in Python library directory
+
+* Tue Jan 15 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.7-1
+- Upstream update
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu May 10 2018 Jonathan Wakely <jwakely@redhat.com> - 1.00.6-4
+- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 22 2018 Jonathan Wakely <jwakely@redhat.com> - 1.00.6-2
+- Rebuilt for Boost 1.66
+
+* Sun Aug 06 2017 Denis Arnaud <denis_arnaud at users dot sourceforge dot net> - 1.00.6
+- Fixed the FTBFS issue related to newer Boost Serialization (from 1.63).
+  Ref: StdAir issue #2 on GitHub (http://github.com/airsim/stdair/issues/2)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Sat Jul 29 2017 Filipe Rosset <rosset.filipe@gmail.com> - 1.00.5-5
+- Spec clean up
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jul 23 2017 Björn Esser <besser82@fedoraproject.org> - 1.00.5-3
+- Rebuilt for Boost 1.64
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Sun Feb 26 2017 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.5-1
+- Upstream update
+
+* Sat Feb 25 2017 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-12
+- Attempt to fix the FTBFS issue related to new Boost 1.63 serialization
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue May 17 2016 Jonathan Wakely <jwakely@redhat.com> - 1.00.2-8
+- Rebuilt for linker errors in boost (#1331983)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 1.00.2-6
+- Rebuilt for Boost 1.60
+
+* Sat Aug 29 2015 Jonathan Wakely <jwakely@redhat.com> 1.00.2-5
+- Patched and rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.00.2-3
+- rebuild for Boost 1.58
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun May 31 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-1
+- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.00.1-14
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.00.1-13
+- Rebuild for boost 1.57.0
+- Cmake should look for zmq.h, not zmq.hpp (stdair-1.00.1-cmake.patch)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 14 2014 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-11
+- Rebuild for ARM. It seems to work:
+  http://arm.koji.fedoraproject.org/koji/taskinfo?taskID=2415169
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 1.00.1-9
+- Rebuild for boost 1.55.0
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jul 29 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-7
+- Fixed the docdir issue, following the F20 System Wide Change
+- Fixed wrong dates in the changelog
+
+* Sat Jul 27 2013 Petr Machata <pmachata@redhat.com> - 1.00.1-6
+- Rebuild for boost 1.54.0
+
+* Sun Jun 02 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-5
+- Bump the version to be consistent with F19
+
+* Wed May 22 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-4
+- Rebuild for Soci-3.2.1
+
+* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-3
+- Rebuild for Boost-1.53.0
+
+* Wed Jan 02 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-2
+- Bump the version to be consistent with F18
+
+* Sun Dec 23 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-1
+- Upstream update
+
+* Sat Dec 22 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-1
+- Upstream update
+
+* Sun Aug 12 2012 Kevin Fenzi <kevin@scrye.com> - 0.45.1-4
+- Rebuild for new boost
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.45.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.45.1-2
+- Rebuilt for c++ ABI breakage
+
+* Sun Jan 15 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.45.1-1
+- Upstream update
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Dec 04 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.45.0-1
+- Upstream update
+
+* Sun Nov 20 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.44.1-2
+- Rebuild for the new Boost-1.48.0
+
+* Sat Nov 05 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.44.1-1
+- Upstream update
+
+* Wed Nov 02 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.44.0-1
+- Upstream update
+
+* Tue Oct 18 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.43.1-1
+- The build framework is now compatible with CMake 2.6 (the exclusive
+  dependency on CMake 2.8 has been removed).
+
+* Sat Oct 15 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.43.0-2
+- Improved a little the package descriptions
+
+* Sat Oct 15 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.43.0-1
+- Upstream update
+
+* Mon Aug 15 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.38.0-1
+- Upstream update
+
+* Fri Aug 12 2011 Adam Jackson <ajax@redhat.com> 0.36.2-2
+- Rebuild for new boost
+
+* Mon Aug 01 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.36.2-1
+- The CMake framework now takes into account compilation flags
+
+* Sun Jul 31 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.36.1-1
+- Upstream update
+
+* Sun Jul 31 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.36.0-2
+- Took into account review elements (#702987)
+
+* Tue Jul 26 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.36.0-1
+- Upstream update
+
+* Thu Jul 07 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.35.0-1
+- Upstream update
+
+* Wed Jun 15 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.34.0-1
+- Upstream update
+- The build system is now CMake (instead of the GNU Autotools)
+
+* Tue Jun  7 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.33.0-1
+- Upstream update
+
+* Sun May 22 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.32.0-1
+- Upstream update
+
+* Mon May 16 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.31.0-1
+- Upstream update
+
+* Fri Apr 29 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.30.0-1
+- Upstream update
+
+* Wed Apr 20 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.29.0-1
+- Upstream update
+
+* Sun Apr 17 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.28.0-1
+- Upstream update
+
+* Tue Apr 12 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.27.0-1
+- Upstream update
+
+* Fri Apr 08 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.26.0-1
+- Upstream update
+
+* Tue Apr 05 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.25.0-1
+- Upstream update
+
+* Fri Apr 01 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.24.0-1
+- Upstream update
+
+* Thu Mar 24 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.23.0-1
+- Upstream update
+
+* Thu Mar 17 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.22.0-1
+- Upstream update
+
+* Sun Mar 13 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.21.0-1
+- Upstream update
+
+* Fri Mar  4 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.20.0-1
+- Upstream update
+
+* Thu Mar  3 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.19.0-1
+- Upstream update
+
+* Thu Mar  3 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.18.0-1
+- Upstream update
+
+* Wed Mar  2 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.17.0-1
+- Upstream update
+
+* Fri Feb 25 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.16.0-1
+- Upstream update
+
+* Tue Feb 22 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.15.0-1
+- Upstream update
+
+* Sat Feb 19 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.14.0-1
+- Upstream update
+
+* Wed Feb 16 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.13.0-1
+- Upstream update
+
+* Sat Feb 12 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.12.0-1
+- Upstream update
+
+* Tue Jan 18 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.11.0-1
+- Upstream update
+
+* Wed Dec 29 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.10.0-1
+- Upstream update
+
+* Fri Dec 03 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.9.0-1
+- Upstream update
+
+* Sat Nov 06 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.8.0-1
+- Upstream update
+
+* Thu Oct 14 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.7.0-1
+- Upstream update
+
+* Thu Oct 14 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.6.0-1
+- Upstream update
+
+* Thu Sep 16 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.5.0-1
+- Upstream update
+
+* Fri Sep 03 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.4.0-1
+- Replace extracc external ref to dependency
+
+* Sun Aug 29 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.3.0-1
+- Upstream update
+
+* Tue Jul 13 2010 Son Nguyen Kim <nguyenkims@gmail.com> 0.1.0-1
+- First RPM release