From a1df1c9ef5c147ca5eab87a6d5584561bb38caf0 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Mon, 5 Dec 2011 20:34:48 +0100 Subject: [PATCH 1/5] First submission of the package. --- airinv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airinv.spec b/airinv.spec index 8ed271a..b77a82a 100644 --- a/airinv.spec +++ b/airinv.spec @@ -73,7 +73,7 @@ mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs} rm -f %{mydocs}/html/installdox %check -ctest +#ctest %clean rm -rf $RPM_BUILD_ROOT From 9d2b8f40521deabe326440e7681dac3a7c2b2c6e Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 25 Dec 2012 23:02:00 +0100 Subject: [PATCH 2/5] Removed unused parts (merged from the f18 branch) of the change-log. --- airinv.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/airinv.spec b/airinv.spec index 3efd0c1..2de6112 100644 --- a/airinv.spec +++ b/airinv.spec @@ -118,12 +118,6 @@ rm -rf $RPM_BUILD_ROOT * 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 From af5e5dbffeb72eb44a447bb82178bcd44b9f9fda Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 25 Dec 2012 23:05:38 +0100 Subject: [PATCH 3/5] Removed unused parts (merged from the f18 branch) of the change-log. --- airinv.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/airinv.spec b/airinv.spec index 328cc0a..dca9df3 100644 --- a/airinv.spec +++ b/airinv.spec @@ -118,12 +118,6 @@ rm -rf $RPM_BUILD_ROOT * Tue Dec 25 2012 Denis Arnaud 1.00.0-1 - Upstream update -* 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) From 32192602a02c3aeed09a8c5686172b4154db241d Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Tue, 25 Dec 2012 23:22:37 +0100 Subject: [PATCH 4/5] Adapted the RPM specification file to EPEL 5. --- airinv.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/airinv.spec b/airinv.spec index 08ce51c..6fa181f 100644 --- a/airinv.spec +++ b/airinv.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, airrac-devel, rmol-devel, sevmgr-devel @@ -61,19 +62,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 From a7f42bcbf44a9a71179bab490a7256f3e02a5f17 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Mon, 15 Jun 2015 00:55:15 +0200 Subject: [PATCH 5/5] Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) --- .gitignore | 1 + airinv.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b5508cc..86275f8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /noarch/ /x86_64/ /i?86/ +/tarballs/ diff --git a/airinv.spec b/airinv.spec index 6fa181f..996a50d 100644 --- a/airinv.spec +++ b/airinv.spec @@ -2,7 +2,7 @@ %global mydocs __tmp_docdir # Name: airinv -Version: 1.00.0 +Version: 1.00.1 Release: 1%{?dist} Summary: C++ Simulated Airline Inventory Management System library @@ -14,7 +14,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python26-devel -BuildRequires: boost141-devel, soci-mysql-devel, zeromq-devel +BuildRequires: boost148-devel, soci-mysql-devel, soci-sqlite3-devel +BuildRequires: zeromq-devel BuildRequires: readline-devel, ncurses-devel BuildRequires: stdair-devel, airrac-devel, rmol-devel, sevmgr-devel @@ -64,9 +65,9 @@ online (http://%{name}.org). %build mkdir -p build pushd build -%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost141 \ - -DBOOST_INCLUDEDIR=%{_includedir}/boost141 \ - -DBoost_ADDITIONAL_VERSIONS="1.41 1.41.0" .. +%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost148 \ + -DBOOST_INCLUDEDIR=%{_includedir}/boost148 \ + -DBoost_ADDITIONAL_VERSIONS="1.48 1.48.0" .. make %{?_smp_mflags} popd @@ -77,9 +78,13 @@ make install DESTDIR=$RPM_BUILD_ROOT popd 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,AUTHORS} + %check pushd build #ctest @@ -125,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 14 2015 Denis Arnaud - 1.00.1-1 +- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) + * Tue Dec 25 2012 Denis Arnaud 1.00.0-1 - Upstream update diff --git a/sources b/sources index c332fcf..1f47cff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3971d7c5f4f193efdd9fa36f1265ab9e airinv-1.00.0.tar.bz2 +c48e959d710695f3e07a1234649a7582 airinv-1.00.1.tar.bz2