From e17c29c198e70b782974495dd85dee6fc411a7c4 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Aug 17 2015 17:20:14 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/.gitignore b/.gitignore
index 0315bdb..c09e303 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ asio-1.4.1.tar.gz
 /asio-1.4.8.tar.bz2
 /asio-00cdf672654fda984b0c57218eaf77845ad4167a.tar.gz
 /asio-581fe686293be42260800c54cf2ac33576f35497.tar.gz
+/asio-c466dc46d55755d38ee1831e95207d6b329c4976.tar.gz
diff --git a/asio.spec b/asio.spec
index 8622529..05f02de 100644
--- a/asio.spec
+++ b/asio.spec
@@ -1,13 +1,13 @@
 # asio only ships headers, so no debuginfo package is needed
 %define debug_package %{nil}
 
-%global commit 581fe686293be42260800c54cf2ac33576f35497
+%global commit c466dc46d55755d38ee1831e95207d6b329c4976
 
 Summary: A cross-platform C++ library for network programming
 Name: asio
-Version: 1.10.4
-Release: 2%{?dist}
-URL: http://sourceforge.net/projects/asio/
+Version: 1.10.6
+Release: 1%{?dist}
+URL: https://think-async.com
 Source0: https://github.com/chriskohlhoff/asio/archive/%{commit}/asio-%{commit}.tar.gz
 License: Boost
 Group: System Environment/Libraries
@@ -55,6 +55,18 @@ make %{?_smp_mflags}
 %{_includedir}/asio.hpp
 
 %changelog
+* Sun Jul 26 2015 Fabio Alessandro Locati <fabio@locati.cc> -1.10.6-1
+- Update to 1.10.6 version
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.10.4-5
+- rebuild for Boost 1.58
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jan 26 2015 Petr Machata <pmachata@redhat.com> - 1.10.4-3
+- Rebuild for boost 1.57.0
+
 * Sat Oct 11 2014 Fabio Alessandro Locati <fabiolocati@gmail.com> - 1.10.4-2
 - Forgot to update the commit id
 
diff --git a/sources b/sources
index a8dafa0..587c3ce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c158ab8c9794426c771b4096d1eebb4d  asio-00cdf672654fda984b0c57218eaf77845ad4167a.tar.gz
-f5a930cb07430f9c1b07c0cf83bb9296  asio-581fe686293be42260800c54cf2ac33576f35497.tar.gz
+c17214ddcc475d71b92d528745e64d0a  asio-c466dc46d55755d38ee1831e95207d6b329c4976.tar.gz