diff --git a/ardour4.spec b/ardour4.spec index 2a6ffc0..a1cee80 100644 --- a/ardour4.spec +++ b/ardour4.spec @@ -1,5 +1,5 @@ # glibmm needs --std=c++11 for F-23 and later -%if %{!?fedora:23}%{?fedora} >= 23 +%if !%{?fedora}%{?rhel} || %{?fedora} >= 23 || %{?rhel} >= 8 %bcond_without cxx11 %else %bcond_with cxx11 @@ -31,7 +31,7 @@ Name: ardour4 Version: 4.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Digital Audio Workstation Group: Applications/Multimedia @@ -110,7 +110,9 @@ BuildRequires: taglib-devel >= 1.4 BuildRequires: vamp-plugin-sdk-devel Requires: %{name}-audiobackend%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%if ! 0%{?fedora}%{?rhel} || %{?fedora} >= 21 || %{?rhel} >= 8 Recommends: %{name}-audiobackend-%{default_backend}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%endif Requires: google-droid-sans-mono-fonts %description @@ -308,6 +310,9 @@ fi %{_mandir}/*/man1/%{name}.1* %changelog +* Mon Aug 01 2016 Nils Philippsen - 4.7.0-3 +- update conditionals and fix building for EPEL (original patch by Phil Wyett) + * Tue Mar 08 2016 Nils Philippsen - 4.7.0-2 - determine CPU features correctly on x86 (#1312551, patch by Florian Weimer)