boost rebuild

[packages/Collage.git] / Collage.spec

diff --git a/Collage.spec b/Collage.spec
index d3b9a82aa42d4eb437d7e4b00895f59f3dbc6f12..002df40b3d4fbd54a92cd171cf656a318fd92bad 100644 (file)
--- a/Collage.spec
+++ b/Collage.spec
@@ -1,28 +1,38 @@
 #
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
-#
+
 Summary:       Cross-platform C++ network library
 Summary(pl.UTF-8):     Wieloplatformowa biblioteka sieciowa dla C++
 Name:          Collage
-Version:       1.1.2
-Release:       1
+Version:       1.7.0
+Release:       8
 License:       LGPL v2.1
 Group:         Libraries
+#Source0Download: https://github.com/Eyescale/Collage/releases
 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: f0e57c1a2f6196c11ad8ac6029483e56
+Patch0:                boost-1.61.patch
+Patch1:                %{name}-boost.patch
+Patch2:                includes.patch
 URL:           http://libcollage.net/
-BuildRequires: Lunchbox-devel >= 1.10
+BuildRequires: Lunchbox-devel >= 1.16.0
+BuildRequires: Eyescale-CMake >= 2017.05
+BuildRequires: Pression-devel >= 2.0.0
+BuildRequires: Servus-devel >= 1.5.1
 BuildRequires: boost-devel >= 1.41.0
-BuildRequires: cmake >= 2.8
+BuildRequires: cmake >= 3.1
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
 BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.605
 BuildRequires: udt-devel
+Requires:      Lunchbox >= 1.16.0
+Requires:      Pression >= 2.0.0
+Requires:      Servus >= 1.5.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,6 +60,10 @@ Summary:     Header files for Collage library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Collage
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      Lunchbox-devel >= 1.16.0
+Requires:      Pression-devel >= 2.0.0
+Requires:      Servus-devel >= 1.5.1
+Requires:      boost-devel >= 1.41.0
 
 %description devel
 Header files for Collage library.
@@ -61,6 +75,7 @@ Pliki nagłówkowe biblioteki Collage.
 Summary:       Collage API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki Collage
 Group:         Documentation
+BuildArch:     noarch
 
 %description apidocs
 API documentation for Collage library.
@@ -69,16 +84,20 @@ API documentation for Collage library.
 Dokumentacja API biblioteki Collage.
 
 %prep
-%setup -q -a1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
-%{__mv} CMake-* CMake/common
-%{__rm} .gitexternals
+rmdir CMake/common
+ln -s %{_datadir}/Eyescale-CMake CMake/common
 
 %build
 install -d build
 cd build
 %cmake .. \
-       -DBUILDYARD_DISABLED=ON
+       -DBUILDYARD_DISABLED=ON \
+       -DCOMMON_DISABLE_WERROR=ON
 %{__make}
 
 %if %{with apidocs}
@@ -101,18 +120,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.7
 
 %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