macros for %cmake

[packages/Lunchbox.git] / Lunchbox.spec

diff --git a/Lunchbox.spec b/Lunchbox.spec
index ef450d67bc12ab4e46c259985a0fd78377493941..9d154ab31848857b641fb97b911eed658b4a699d 100644 (file)
--- a/Lunchbox.spec
+++ b/Lunchbox.spec
@@ -7,13 +7,14 @@ Summary:      Lunchbox - C++ library for multi-threading programming
 Summary(pl.UTF-8):     Lunchbox - biblioteka C++ do programowania wielowątkowego
 Name:          Lunchbox
 Version:       1.17.0
-Release:       1
+Release:       6
 License:       LGPL v2.1
 Group:         Libraries
 #Source0Download: https://github.com/Eyescale/Lunchbox/releases
 Source0:       https://github.com/Eyescale/Lunchbox/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 76bcd79003c9b9d58d5f772cfdd812c7
-Patch2:                cxx.patch
+Patch0:                cxx.patch
+Patch1:                nanosleep.patch
 URL:           http://pogl.wordpress.com/category/lunchbox/
 BuildRequires: Eyescale-CMake >= 2018.02
 BuildRequires: Servus-devel >= 1.5.0
@@ -22,9 +23,11 @@ BuildRequires:       boost-devel >= 1.41.0
 BuildRequires: cmake >= 3.1
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: hwloc-devel >= 1.3
+BuildRequires: hwloc-devel < 2
 BuildRequires: libstdc++-devel
 %{?with_mpi:BuildRequires:     mpi-devel}
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.605
 Requires:      Servus >= 1.5.0
 Requires:      hwloc-libs >= 1.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,9 +65,7 @@ Pliki nagłówkowe biblioteki Lunchbox.
 Summary:       Lunchbox API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki Lunchbox
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 API documentation for Lunchbox library.
@@ -78,7 +79,8 @@ Dokumentacja API biblioteki Lunchbox.
 rmdir CMake/common
 ln -s %{_datadir}/Eyescale-CMake CMake/common
 
-%patch2 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 install -d build