From 36efd3efa931f537aa6872f2c294aaa7d99127be Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 20 Feb 2017 11:20:46 -0600 Subject: [PATCH] Add conditionals to deal with EL 6 & 7. --- codec2.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/codec2.spec b/codec2.spec index e599c7d..de35e7a 100644 --- a/codec2.spec +++ b/codec2.spec @@ -7,9 +7,13 @@ License: LGPLv2 URL: http://rowetel.com/codec2.html Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz -BuildRequires: cmake +Patch0: codec2-el6_gnu11.patch + +BuildRequires: cmake%{?rhel:3} BuildRequires: speex-devel +%if 0%{?fedora} BuildRequires: speexdsp-devel +%endif %description @@ -37,13 +41,19 @@ Example code for Codec 2 %prep -%autosetup +%setup -q +%patch0 -p1 %build rm -rf build_linux && mkdir build_linux && pushd build_linux -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - ../ +%if 0%{?rhel} +%cmake3 \ +%else +%cmake \ +%endif + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + ../ make %{?_smp_mflags} @@ -70,6 +80,7 @@ EOF %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -95,6 +106,9 @@ EOF * Wed Feb 03 2016 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Mon Apr 25 2016 Richard Shaw - 0.5.1-1 +- Update to latest upstream release. + * Thu Oct 29 2015 Richard Shaw - 0.5-1 - Update to latest upstream release.