From 25f08a29a81f9460427386b09c419a6a6e423238 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sun, 31 May 2015 21:51:34 +0200
Subject: Removed the dependency on ZeroMQ (only AirInv is dependent on it, not
StdAir)
diff --git a/stdair-1.00.1-cmake.patch b/stdair-1.00.1-cmake.patch
deleted file mode 100644
index 66c5091..0000000
--- a/stdair-1.00.1-cmake.patch
+++ /dev/null
@@ -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
diff --git a/stdair.spec b/stdair.spec
index 11cf449..521001f 100644
--- a/stdair.spec
+++ b/stdair.spec
@@ -2,8 +2,8 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 1.00.1
-Release: 14%{?dist}
+Version: 1.00.2
+Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -11,7 +11,6 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://%{name}.sourceforge.net
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)
BuildRequires: cmake, python-devel
@@ -59,7 +58,6 @@ online (http://%{name}.org).
%prep
%setup -q
-%patch0 -p1
%build
@@ -74,12 +72,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
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}-%{version}/{NEWS,README,AUTHORS}
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README,AUTHORS}
%check
ctest
@@ -146,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun May 31 2015 Denis Arnaud <denis.arnaud_fedora(a)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(a)gmail.com> - 1.00.1-14
- Rebuilt for GCC 5 C++11 ABI change
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/stdair.git/commit/?h=epel7&id=25f0...