Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)

Rebuild for Soci-3.2.1
Merge branch 'f17' into el6
2015-06-15 00:20:37 +02:00 · 2013-05-22 23:44:17 +02:00 · 2012-12-25 23:18:40 +01:00 · 2012-12-25 23:17:11 +01:00 · 2012-12-25 23:05:38 +01:00 · 2012-12-25 23:05:11 +01:00
3 changed files with 28 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,4 @@
 /noarch/
 /x86_64/
 /i?86/
+/tarballs/
--- 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,9 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

 BuildRequires:  cmake, python-devel
-BuildRequires:  boost-devel, soci-mysql-devel, zeromq-devel, readline-devel,
+BuildRequires:  boost148-devel, soci-mysql-devel, soci-sqlite3-devel
+BuildRequires:  zeromq-devel
+BuildRequires:  readline-devel
 BuildRequires:  stdair-devel, airrac-devel, rmol-devel, sevmgr-devel


@ -61,19 +63,32 @@ online (http://%{name}.org).


 %build
-%cmake .
+mkdir -p build
+pushd build
+%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost148 \
+ -DBOOST_INCLUDEDIR=%{_includedir}/boost148 \
+ -DBoost_ADDITIONAL_VERSIONS="1.48 1.48.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}
+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
+pushd build
+#ctest
+popd

 %clean
 rm -rf $RPM_BUILD_ROOT
@ -115,21 +130,15 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Sun Jun 14 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-1
+- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
+
+* Wed May 22 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-2
+- Rebuild for Soci-3.2.1
+
 * Tue Dec 25 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> 1.00.0-1
 - Upstream update

-* Sun Aug 12 2012 Kevin Fenzi <kevin@scrye.com> - 0.1.2-5
- Rebuilt for new boost
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-3
- Rebuilt for c++ ABI breakage
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Sun Dec 04 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.2-1
 - Upstream update. Took into account review request (#750099)

--- a/2
+++ b/2
@ -1 +1 @@
-3971d7c5f4f193efdd9fa36f1265ab9e  airinv-1.00.0.tar.bz2
+c48e959d710695f3e07a1234649a7582  airinv-1.00.1.tar.bz2
Author	SHA1	Message	Date
Denis Arnaud	4f8a17cb3f	Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)	2015-06-15 00:20:37 +02:00
Denis Arnaud	ca5c2ac3ab	Rebuild for Soci-3.2.1	2013-05-22 23:44:17 +02:00
Denis Arnaud	6f949b071d	Merge branch 'f17' into el6	2012-12-25 23:18:40 +01:00
Denis Arnaud	0da84615d6	Merge branch 'f18' into f17	2012-12-25 23:17:11 +01:00
Denis Arnaud	af5e5dbffe	Removed unused parts (merged from the f18 branch) of the change-log.	2012-12-25 23:05:38 +01:00
Denis Arnaud	05253e83ce	Merge branch 'f17' into el6	2012-12-25 23:05:11 +01:00
Denis Arnaud	9d2b8f4052	Removed unused parts (merged from the f18 branch) of the change-log.	2012-12-25 23:02:00 +01:00
Denis Arnaud	a1df1c9ef5	First submission of the package.	2011-12-05 20:34:48 +01:00