boost rebuild

[packages/Collage.git] / Collage.spec

diff --git a/Collage.spec b/Collage.spec
index 310445f60786f745a73990ee37d9581631176d21..002df40b3d4fbd54a92cd171cf656a318fd92bad 100644 (file)
--- a/Collage.spec
+++ b/Collage.spec
@@ -6,7 +6,7 @@ Summary:        Cross-platform C++ network library
 Summary(pl.UTF-8):     Wieloplatformowa biblioteka sieciowa dla C++
 Name:          Collage
 Version:       1.7.0
-Release:       3
+Release:       8
 License:       LGPL v2.1
 Group:         Libraries
 #Source0Download: https://github.com/Eyescale/Collage/releases
@@ -14,6 +14,7 @@ Source0:      https://github.com/Eyescale/Collage/archive/%{version}/%{name}-%{versio
 # Source0-md5: f0e57c1a2f6196c11ad8ac6029483e56
 Patch0:                boost-1.61.patch
 Patch1:                %{name}-boost.patch
+Patch2:                includes.patch
 URL:           http://libcollage.net/
 BuildRequires: Lunchbox-devel >= 1.16.0
 BuildRequires: Eyescale-CMake >= 2017.05
@@ -26,6 +27,8 @@ 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
@@ -72,9 +75,7 @@ Pliki nagłówkowe biblioteki Collage.
 Summary:       Collage API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki Collage
 Group:         Documentation
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 API documentation for Collage library.
@@ -86,6 +87,7 @@ Dokumentacja API biblioteki Collage.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rmdir CMake/common
 ln -s %{_datadir}/Eyescale-CMake CMake/common
@@ -94,7 +96,8 @@ ln -s %{_datadir}/Eyescale-CMake CMake/common
 install -d build
 cd build
 %cmake .. \
-       -DBUILDYARD_DISABLED=ON
+       -DBUILDYARD_DISABLED=ON \
+       -DCOMMON_DISABLE_WERROR=ON
 %{__make}
 
 %if %{with apidocs}