From 432025e05906f3f94fd97eb251d1ba3fcd8b6a4d Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Fri, 26 Oct 2012 14:11:51 +0200 Subject: [PATCH] - flex-static has been renamed to flex-devel with Fedora-18 and RHEL-7 --- motif.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/motif.spec b/motif.spec index d8c21e7..7cc2929 100644 --- a/motif.spec +++ b/motif.spec @@ -12,7 +12,14 @@ Provides: openmotif = %{version}-%{release} Requires: xorg-x11-xbitmaps Requires: xorg-x11-xinit -BuildRequires: automake, libtool, autoconf, flex, flex-static%{?_isa} +BuildRequires: automake, libtool, autoconf, flex +# flex static libs have been part of flex for RHEL <= 6 and Fedora <= 12 +%if 0%{?fedora} > 17 && 0%{?rhel} > 6 +BuildRequires: flex-devel%{?_isa} +%endif +%if 0%{?fedora} > 12 && 0%{?fedora} <= 17 +BuildRequires: flex-static%{?_isa} +%endif BuildRequires: byacc, pkgconfig BuildRequires: libjpeg-devel%{?_isa} libpng-devel%{?_isa} BuildRequires: libXft-devel%{?_isa} libXmu-devel%{?_isa} libXp-devel%{?_isa} @@ -122,6 +129,7 @@ rm -rf %{buildroot} %changelog * Fri Oct 26 2012 Thomas Woerner 2.3.4-2 - fixed requirements according to review (RHBZ#870049) +- flex-static has been renamed to flex-devel with Fedora-18 and RHEL-7 * Thu Oct 25 2012 Thomas Woerner 2.3.4-1 - new version 2.3.4 with LGPL license