From ef101371c41cad1596666d47a170ae427edc299c Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date: Sun, 21 Jun 2015 21:29:38 +0200
Subject: [PATCH] Removed the dependency on ZeroMQ (only AirInv is dependent on
 it, not StdAir)

---
 .gitignore                |  1 +
 sources                   |  2 +-
 stdair-1.00.1-cmake.patch | 14 --------------
 travelccm.spec            | 16 +++++++++-------
 4 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 stdair-1.00.1-cmake.patch

diff --git a/.gitignore b/.gitignore
index 68699b9..e2da756 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /noarch/
 /x86_64/
 /i?86/
+/tarballs/
diff --git a/sources b/sources
index 778d213..4da3eb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a9b0379f13cac86de6000d26f520cf3  travelccm-1.00.1.tar.bz2
+c3cd885e29cdc9d46eb287439a62178b  travelccm-1.00.2.tar.bz2
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/travelccm.spec b/travelccm.spec
index 3840faa..86e37ec 100644
--- a/travelccm.spec
+++ b/travelccm.spec
@@ -3,8 +3,8 @@
 #
 Name:           travelccm
 %global sfname  travel-ccm
-Version:        1.00.1
-Release:        11%{?dist}
+Version:        1.00.2
+Release:        1%{?dist}
 
 Summary:        C++ Travel Customer Choice Model (CCM) Library
 
@@ -12,11 +12,11 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/%{sfname}/
 Source0:        http://downloads.sourceforge.net/%{sfname}/%{name}-%{version}.tar.bz2
-Patch0:         stdair-1.00.1-cmake.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  cmake, python-devel
-BuildRequires:  boost-devel, soci-mysql-devel, zeromq-devel, readline-devel
+BuildRequires:  boost-devel, soci-mysql-devel, soci-sqlite3-devel
+BuildRequires:  readline-devel
 BuildRequires:  stdair-devel
 
 
@@ -78,7 +78,6 @@ online (http://%{name}.org).
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -90,12 +89,12 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 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
@@ -134,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 21 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)
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild