Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
This commit is contained in:
parent
f4a15b0c8a
commit
25f08a29a8
|
@ -1,14 +0,0 @@
|
||||||
diff -up stdair-1.00.1/config/FindZeroMQ.cmake\~ stdair-1.00.1/config/FindZeroMQ.cmake
|
|
||||||
--- stdair-1.00.1/config/FindZeroMQ.cmake~ 2012-12-22 11:44:25.000000000 +0100
|
|
||||||
+++ stdair-1.00.1/config/FindZeroMQ.cmake 2015-01-28 10:12:48.786823055 +0100
|
|
||||||
@@ -25,7 +25,7 @@ find_library (ZeroMQ_LIBRARIES
|
|
||||||
HINTS ${ZeroMQ_ROOT_DIR}/lib)
|
|
||||||
|
|
||||||
find_path (ZeroMQ_INCLUDE_DIR
|
|
||||||
- NAMES zmq.hpp
|
|
||||||
+ NAMES zmq.h
|
|
||||||
HINTS ${ZeroMQ_ROOT_DIR}/include)
|
|
||||||
|
|
||||||
#
|
|
||||||
|
|
||||||
Diff finished. Wed Jan 28 10:13:03 2015
|
|
13
stdair.spec
13
stdair.spec
|
@ -2,8 +2,8 @@
|
||||||
%global mydocs __tmp_docdir
|
%global mydocs __tmp_docdir
|
||||||
#
|
#
|
||||||
Name: stdair
|
Name: stdair
|
||||||
Version: 1.00.1
|
Version: 1.00.2
|
||||||
Release: 14%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: C++ Standard Airline IT Object Library
|
Summary: C++ Standard Airline IT Object Library
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ Group: System Environment/Libraries
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://%{name}.sourceforge.net
|
URL: http://%{name}.sourceforge.net
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||||
Patch0: stdair-1.00.1-cmake.patch
|
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
|
|
||||||
BuildRequires: cmake, python-devel
|
BuildRequires: cmake, python-devel
|
||||||
|
@ -59,7 +58,6 @@ online (http://%{name}.org).
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -74,12 +72,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
find $RPM_BUILD_ROOT%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \;
|
find $RPM_BUILD_ROOT%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \;
|
||||||
|
|
||||||
mkdir -p %{mydocs}
|
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
|
rm -f %{mydocs}/html/installdox
|
||||||
|
|
||||||
# Remove additional documentation files (those files are already available
|
# Remove additional documentation files (those files are already available
|
||||||
# in the project top directory)
|
# in the project top directory)
|
||||||
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{NEWS,README,AUTHORS}
|
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README,AUTHORS}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
ctest
|
ctest
|
||||||
|
@ -146,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.00.1-14
|
||||||
- Rebuilt for GCC 5 C++11 ABI change
|
- Rebuilt for GCC 5 C++11 ABI change
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue