From f80c4517b35f8d459695b32624975957e32b9ab9 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sun, 14 Jun 2015 23:54:58 +0200 Subject: [PATCH 1/8] Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) --- .gitignore | 9 +++ airinv.spec | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 202 insertions(+) create mode 100644 airinv.spec diff --git a/.gitignore b/.gitignore index e69de29..86275f8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,9 @@ +/airinv-*.tar.* +/airinv-*.src.rpm +/airinv-*.*.*/ +/clog +.build-*.*.log +/noarch/ +/x86_64/ +/i?86/ +/tarballs/ diff --git a/airinv.spec b/airinv.spec new file mode 100644 index 0000000..8de3562 --- /dev/null +++ b/airinv.spec @@ -0,0 +1,192 @@ +# +%global mydocs __tmp_docdir +# +Name: airinv +Version: 1.00.1 +Release: 1%{?dist} + +Summary: C++ Simulated Airline Inventory Management System 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) + +BuildRequires: cmake, python-devel +BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel +# FIXME: Workaround to RHBZ#1190463 +%if 0%{?fedora} >= 22 +BuildRequires: zeromq-devel, cppzmq-devel +%else +BuildRequires: zeromq-devel +%endif +BuildRequires: readline-devel +BuildRequires: stdair-devel, airrac-devel, rmol-devel, sevmgr-devel +BuildRequires: /usr/bin/epstopdf + + +%description +%{name} is a C++ library of airline inventory management classes and +functions, mainly targeting simulation purposes. + +%{name} makes an extensive use of existing open-source libraries for +increased functionality, speed and accuracy. In particular the +Boost (C++ Standard Extensions: http://www.boost.org) library is used. + +Install the %{name} package if you need a library of basic C++ objects +for Airline Inventory Management, 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 + +%description devel +This package contains the header files, shared libraries and +development helper tools for %{name}. If you would like to develop +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 + +%description doc +This package contains HTML pages, as well as a PDF reference manual, +for %{name}. All that documentation is generated thanks to Doxygen +(http://doxygen.org). The content is the same as what can be browsed +online (http://%{name}.org). + + +%prep +%setup -q + + +%build +%cmake . +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +mkdir -p %{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,AUTHORS} + +%check +ctest + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_bindir}/%{name} +%{_bindir}/%{name}_parseInventory +%{_bindir}/AirInvClient +%{_bindir}/AirInvServer +%{_libdir}/lib%{name}.so.* +%{_mandir}/man1/%{name}.1.* +%{_mandir}/man1/%{name}_parseInventory.1.* +%{_mandir}/man1/AirInvClient.1.* +%{_mandir}/man1/AirInvServer.1.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name} +%{_bindir}/%{name}-config +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/aclocal/%{name}.m4 +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/CMake +%{_mandir}/man1/%{name}-config.1.* +%{_mandir}/man3/%{name}-library.3.* + +%files doc +%defattr(-,root,root,-) +%doc %{mydocs}/html +%doc COPYING + + +%changelog +* Sun Jun 14 2015 Denis Arnaud - 1.00.1-1 +- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) + +* Mon May 04 2015 Kalev Lember - 1.00.0-13 +- Rebuilt for GCC 5 C++11 ABI change + +* Sun Feb 08 2015 Ralf Corsépius - 1.00.0-12 +- BR: zeromq2-devel (Work around RHBZ#1190463; Fix boost-1.57 FTBFS). +- BR: /usr/bin/epstopdf. + +* Thu Jan 29 2015 Petr Machata - 1.00.0-11 +- Rebuild for boost 1.57.0 +- Cmake should look for zmq.h, not zmq.hpp (stdair-1.00.1-cmake.patch) + +* Fri Aug 15 2014 Fedora Release Engineering - 1.00.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.00.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun May 25 2014 Petr Machata - 1.00.0-8 +- Rebuild for boost 1.55.0 + +* Fri May 23 2014 David Tardon - 1.00.0-7 +- rebuild for boost 1.55.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.00.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 29 2013 Denis Arnaud - 1.00.0-5 +- Fixed the docdir issue, following the F20 System Wide Change +- Rebuild for boost 1.54.0 + +* Wed May 22 2013 Denis Arnaud - 1.00.0-4 +- Rebuild for Soci-3.2.1 + +* Sun Feb 10 2013 Denis Arnaud - 1.00.0-3 +- Rebuild for Boost-1.53.0 + +* Sat Feb 09 2013 Denis Arnaud - 1.00.0-2 +- Rebuild for Boost-1.53.0 + +* Tue Dec 25 2012 Denis Arnaud 1.00.0-1 +- Upstream update + +* Sun Aug 12 2012 Kevin Fenzi - 0.1.2-5 +- Rebuilt for new boost + +* Wed Jul 18 2012 Fedora Release Engineering - 0.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 0.1.2-3 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 0.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Dec 04 2011 Denis Arnaud 0.1.2-1 +- Upstream update. Took into account review request (#750099) + +* Sun Oct 30 2011 Denis Arnaud 0.1.1-1 +- First RPM release + diff --git a/sources b/sources index e69de29..1f47cff 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c48e959d710695f3e07a1234649a7582 airinv-1.00.1.tar.bz2 From 78d158f0aaf8fc94764857447eaf351032aead17 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Mon, 15 Jun 2015 01:10:05 +0200 Subject: [PATCH 2/8] Added a build dependency on cppzmq-devel --- airinv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airinv.spec b/airinv.spec index 8de3562..68a0457 100644 --- a/airinv.spec +++ b/airinv.spec @@ -16,7 +16,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python-devel BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel # FIXME: Workaround to RHBZ#1190463 -%if 0%{?fedora} >= 22 +%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 BuildRequires: zeromq-devel, cppzmq-devel %else BuildRequires: zeromq-devel From 22d8ca3058068337555d6e1b7c766f40fcc0c453 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 18 Jun 2016 17:16:21 +0200 Subject: [PATCH 3/8] Rebuilt for ZeroMQ 4.1.4 (BZ#1301163) --- airinv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airinv.spec b/airinv.spec index 68a0457..ab1beb8 100644 --- a/airinv.spec +++ b/airinv.spec @@ -3,7 +3,7 @@ # Name: airinv Version: 1.00.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ Simulated Airline Inventory Management System library @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 18 2016 Denis Arnaud - 1.00.1-2 +- Rebuilt for ZeroMQ 4.1.4 (BZ#1301163) + * Sun Jun 14 2015 Denis Arnaud - 1.00.1-1 - Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) From 3d921a9fd1d053fd669cdf4d3ff91b3406491781 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 10 Nov 2018 11:50:59 +0000 Subject: [PATCH 4/8] Rebuilt for ZeroMQ 4.1.4-5 (BZ#1647583) --- airinv.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/airinv.spec b/airinv.spec index ab1beb8..e77660c 100644 --- a/airinv.spec +++ b/airinv.spec @@ -3,7 +3,7 @@ # Name: airinv Version: 1.00.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ Simulated Airline Inventory Management System library @@ -16,7 +16,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python-devel BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel # FIXME: Workaround to RHBZ#1190463 -%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 BuildRequires: zeromq-devel, cppzmq-devel %else BuildRequires: zeromq-devel @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 10 2018 Denis Arnaud - 1.00.1-3 +- Rebuilt for ZeroMQ 4.1.4-5 (BZ#1647583) + * Sat Jun 18 2016 Denis Arnaud - 1.00.1-2 - Rebuilt for ZeroMQ 4.1.4 (BZ#1301163) From 4dad984d1e71519f145ab3a2f14fb09de8d1956a Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Fri, 8 May 2020 23:59:04 +0200 Subject: [PATCH 5/8] Rebuild for SOCI 4.0.0 --- airinv.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/airinv.spec b/airinv.spec index e77660c..b7ef86f 100644 --- a/airinv.spec +++ b/airinv.spec @@ -3,7 +3,7 @@ # Name: airinv Version: 1.00.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ Simulated Airline Inventory Management System library @@ -13,7 +13,7 @@ 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: cmake, python-devel, python3-devel, boost-python36-devel BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel # FIXME: Workaround to RHBZ#1190463 %if 0%{?rhel} >= 7 @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 08 2020 Denis Arnaud - 1.00.1-4 +- Rebuild for SOCI 4.0.0 + * Sat Nov 10 2018 Denis Arnaud - 1.00.1-3 - Rebuilt for ZeroMQ 4.1.4-5 (BZ#1647583) From 8dd921689fc3e1ea7d7ab53447dbe4e9ab0e6a7c Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 May 2020 01:08:08 +0200 Subject: [PATCH 6/8] Rebuild for SOCI 4.0.0 --- airinv.spec | 21 ++++++++++----------- sources | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/airinv.spec b/airinv.spec index b7ef86f..18c14ca 100644 --- a/airinv.spec +++ b/airinv.spec @@ -2,18 +2,18 @@ %global mydocs __tmp_docdir # Name: airinv -Version: 1.00.1 -Release: 4%{?dist} +Version: 1.00.2 +Release: 1%{?dist} Summary: C++ Simulated Airline Inventory Management System library Group: System Environment/Libraries License: LGPLv2+ -URL: http://%{name}.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +URL: http://github.com/airsim/%{name} +Source0: %{url}/archive/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: cmake, python-devel, python3-devel, boost-python36-devel +BuildRequires: cmake3, python-devel, python3-devel, boost-python36-devel BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel # FIXME: Workaround to RHBZ#1190463 %if 0%{?rhel} >= 7 @@ -65,11 +65,10 @@ online (http://%{name}.org). %prep -%setup -q - +%autosetup -n %{name}-%{name}-%{version} %build -%cmake . +%cmake3 . make %{?_smp_mflags} %install @@ -82,7 +81,7 @@ 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,AUTHORS} +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README.md,AUTHORS} %check ctest @@ -97,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README.md %{_bindir}/%{name} %{_bindir}/%{name}_parseInventory %{_bindir}/AirInvClient @@ -127,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri May 08 2020 Denis Arnaud - 1.00.1-4 +* Fri May 08 2020 Denis Arnaud - 1.00.2-1 - Rebuild for SOCI 4.0.0 * Sat Nov 10 2018 Denis Arnaud - 1.00.1-3 diff --git a/sources b/sources index 1f47cff..86923ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c48e959d710695f3e07a1234649a7582 airinv-1.00.1.tar.bz2 +SHA512 (airinv-1.00.2.tar.gz) = 96894fb2640913d538c291772f1bb63fb501622ee1c8378e41a5b02b9c71282c671d14fa736a1d2c961230a3a61bc243f3418b47c2c28506e853090e4d04d695 From b92ee823eb6d583f6fff224a6de096b43cc63c7a Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 May 2020 01:15:58 +0200 Subject: [PATCH 7/8] Rebuild for SOCI 4.0.0 --- airinv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airinv.spec b/airinv.spec index 18c14ca..ca6115f 100644 --- a/airinv.spec +++ b/airinv.spec @@ -22,7 +22,7 @@ BuildRequires: zeromq-devel, cppzmq-devel BuildRequires: zeromq-devel %endif BuildRequires: readline-devel -BuildRequires: stdair-devel, airrac-devel, rmol-devel, sevmgr-devel +BuildRequires: stdair-devel, airrac-devel, rmol-devel, python3-rmol, sevmgr-devel BuildRequires: /usr/bin/epstopdf From 1fc7197ce892b2a0546f25d16d241cfd090c3413 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 May 2020 01:25:18 +0200 Subject: [PATCH 8/8] Rebuild for SOCI 4.0.0 --- airinv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airinv.spec b/airinv.spec index ca6115f..cedf775 100644 --- a/airinv.spec +++ b/airinv.spec @@ -13,7 +13,7 @@ URL: http://github.com/airsim/%{name} Source0: %{url}/archive/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: cmake3, python-devel, python3-devel, boost-python36-devel +BuildRequires: cmake3, cmake, python-devel, python3-devel, boost-python36-devel BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel # FIXME: Workaround to RHBZ#1190463 %if 0%{?rhel} >= 7