X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dx.spec;h=4c5e9321ace8a704122b1366fb36bde58044c60a;hb=master;hp=721cc9209001c64608a1609d0c598f8b6d6c3715;hpb=57fd7e05e4ac121a32e3587ebd781e8a4302d184;p=packages%2Fdx.git

diff --git a/dx.spec b/dx.spec
index 721cc92..4c5e932 100644
--- a/dx.spec
+++ b/dx.spec
@@ -2,7 +2,7 @@ Summary:	Excellent tool for making visualization of data
 Summary(pl.UTF-8):	Doskonałe narzędzie do wizualizacji danych
 Name:		dx
 Version:	4.4.4
-Release:	22
+Release:	25
 License:	IPL
 Group:		Applications/Science
 Source0:	http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -38,6 +38,8 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	motif-devel
 BuildRequires:	netcdf-devel
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
@@ -107,9 +109,7 @@ Biblioteki statyczne OpenDX.
 Summary:	OpenDX documentation
 Summary(pl.UTF-8):	Dokumentacja OpenDX
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description doc
 Online help and html documentation for OpenDX.
@@ -121,9 +121,7 @@ Podręczna pomoc oraz dokumentacja html dla OpenDX.
 Summary:	OpenDX Examples
 Summary(pl.UTF-8):	Przykłady dla OpenDX
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description examples
 Examples for OpenDX.
@@ -147,6 +145,10 @@ Przykłady dla OpenDX.
 %patch11 -p1
 
 %build
+%if "%{_ver_ge '%{cxx_version}' '11.0'}" == "1"
+# lower C++ standard because C++17 std::byte conflicts with local "byte" define
+export CXXFLAGS="%{rpmcxxflags} -std=c++14"
+%endif
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}