- up to 1.4.0

- use system Eyescale-CMake
- fix building with boost 1.61

diff --git a/Collage.spec b/Collage.spec
index d447c844e29f4a1f3593c7b0671eab5af2160a60..5ea6fbed286d40438626b10dbfee2f5dd0fa5ff9 100644 (file)
--- a/Collage.spec
+++ b/Collage.spec
@@ -5,16 +5,17 @@
 Summary:       Cross-platform C++ network library
 Summary(pl.UTF-8):     Wieloplatformowa biblioteka sieciowa dla C++
 Name:          Collage
-Version:       1.1.2
-Release:       5
+Version:       1.4.0
+Release:       1
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       https://github.com/Eyescale/Collage/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 89d37ca9f592da59ddfa57ac82eb83c3
-Source1:       https://github.com/Eyescale/CMake/archive/92d0663/Eyescale-CMake-92d0663.tar.gz
-# Source1-md5: 7abca85af7f36fec7e22d7f63d601cf8
+# Source0-md5: 2a245b2739c96cd7144fe35bf0b46e8e
+Patch0:                boost-1.61.patch
 URL:           http://libcollage.net/
-BuildRequires: Lunchbox-devel >= 1.10
+BuildRequires: Lunchbox-devel >= 1.13.0
+BuildRequires: Eyescale-CMake >= 2016.04
+BuildRequires: Pression-devel
 BuildRequires: boost-devel >= 1.41.0
 BuildRequires: cmake >= 2.8
 %{?with_apidocs:BuildRequires: doxygen}
@@ -72,9 +73,10 @@ API documentation for Collage library.
 Dokumentacja API biblioteki Collage.
 
 %prep
-%setup -q -a1
+%setup -q
+%patch0 -p1
 
-%{__mv} CMake-* CMake/common
+ln -s %{_datadir}/Eyescale-CMake CMake/common
 %{__rm} .gitexternals
 
 %build
@@ -104,18 +106,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES.txt LICENSE.txt README.md doc/{README.IB,README.udt} build/doc/RelNotes.md
+%doc LICENSE.txt README.md doc/{README.IB,README.udt} doc/Changelog.md
 %attr(755,root,root) %{_bindir}/coNetperf
 %attr(755,root,root) %{_bindir}/coNodeperf
 %attr(755,root,root) %{_bindir}/coObjectperf
 %attr(755,root,root) %{_libdir}/libCollage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCollage.so.2
+%attr(755,root,root) %ghost %{_libdir}/libCollage.so.4
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libCollage.so
 %{_includedir}/co
-%{_pkgconfigdir}/Collage.pc
 %dir %{_datadir}/Collage
 %{_datadir}/Collage/CMake
 

diff --git a/boost-1.61.patch b/boost-1.61.patch
new file mode 100644 (file)
index 0000000..ac3a6e0
--- /dev/null
+++ b/boost-1.61.patch
@@ -0,0 +1,60 @@
+--- Collage-1.4.0/co/dataIStreamArchive.h~     2016-05-28 17:25:24.000000000 +0000
++++ Collage-1.4.0/co/dataIStreamArchive.h      2016-05-28 17:28:01.400951002 +0000
+@@ -42,6 +42,7 @@
+ #  include <boost/archive/shared_ptr_helper.hpp>
+ #endif
+ #include <boost/serialization/is_bitwise_serializable.hpp>
++#include <boost/serialization/array.hpp>
+ 
+ #include <boost/spirit/home/support/detail/endian.hpp>
+ #include <boost/spirit/home/support/detail/math/fpclassify.hpp>
+@@ -73,7 +72,7 @@
+ 
+     /** @internal use optimized load for arrays. */
+     template< typename T >
+-    void load_array( boost::serialization::array< T >& a, unsigned int );
++    void load_array( boost::serialization::array_wrapper< T >& a, unsigned int );
+ 
+     /** @internal enable serialization optimization for arrays. */
+     struct use_array_optimization
+--- Collage-1.4.0/co/dataIStreamArchive.ipp~   2016-03-21 10:09:25.000000000 +0000
++++ Collage-1.4.0/co/dataIStreamArchive.ipp    2016-05-28 17:28:34.587798794 +0000
+@@ -22,7 +22,7 @@
+ {
+ 
+ template< typename T >
+-void DataIStreamArchive::load_array( boost::serialization::array< T >& a,
++void DataIStreamArchive::load_array( boost::serialization::array_wrapper< T >& a,
+                                      unsigned int )
+ {
+     _stream >> Array< T >( a.address(), a.count( ));
+--- Collage-1.4.0/co/dataOStreamArchive.h~     2016-03-21 10:09:25.000000000 +0000
++++ Collage-1.4.0/co/dataOStreamArchive.h      2016-05-28 17:28:51.074554669 +0000
+@@ -49,6 +49,7 @@
+ #include <boost/type_traits/is_signed.hpp>
+ #include <boost/type_traits/is_floating_point.hpp>
+ 
++#include <boost/serialization/array.hpp>
+ 
+ namespace co
+ {
+@@ -68,7 +68,7 @@
+ 
+     /** @internal use optimized save for arrays. */
+     template< typename T >
+-    void save_array( const boost::serialization::array< T >& a, unsigned int );
++    void save_array( const boost::serialization::array_wrapper< T >& a, unsigned int );
+ 
+     /** @internal enable serialization optimization for arrays. */
+     struct use_array_optimization
+--- Collage-1.4.0/co/dataOStreamArchive.ipp~   2016-03-21 10:09:25.000000000 +0000
++++ Collage-1.4.0/co/dataOStreamArchive.ipp    2016-05-28 17:29:05.451298725 +0000
+@@ -17,7 +17,7 @@
+ 
+ 
+ template< typename T >
+-void DataOStreamArchive::save_array( const boost::serialization::array< T >& a,
++void DataOStreamArchive::save_array( const boost::serialization::array_wrapper< T >& a,
+                                      unsigned int )
+ {
+     _stream << Array< const T >( a.address(), a.count( ));