[OpenEXR_Viewers] make OpenEXR_CTL support optional (since it doesn't support openexr-2.x yet)

Rex Dieter rdieter at fedoraproject.org
Thu Oct 10 16:23:50 UTC 2013


commit e9c5475be952e52233bd7681a809b8452f6ecd8f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 10 11:23:46 2013 -0500

    make OpenEXR_CTL support optional (since it doesn't support openexr-2.x yet)

 OpenEXR_Viewers.spec |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/OpenEXR_Viewers.spec b/OpenEXR_Viewers.spec
index 5f469fc..7a5453c 100644
--- a/OpenEXR_Viewers.spec
+++ b/OpenEXR_Viewers.spec
@@ -10,9 +10,14 @@
 %define priority        5
 %endif
 
+%if 0%{?fedora} < 21
+# https://bugzilla.redhat.com/1017873
+%define openexr_ctl 1
+%endif
+
 Name:           %{real_name}
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Viewers programs for OpenEXR
 
 Group:          Applications/Multimedia
@@ -23,9 +28,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
 
-BuildRequires:  OpenEXR_CTL-devel
-BuildRequires:  OpenEXR_CTL
 BuildRequires:  fltk-devel >= 1.1
+BuildRequires:  pkgconfig(OpenEXR)
 %if %with_Cg
 BuildRequires:  Cg
 BuildRequires:  freeglut-devel
@@ -34,7 +38,11 @@ Provides: OpenEXR_Viewers = %{version}
 BuildConflicts:  Cg
 %endif
 
+%if 0%{?openexr_ctl}
+BuildRequires:  OpenEXR_CTL-devel
+BuildRequires:  OpenEXR_CTL
 Requires:  OpenEXR_CTL
+%endif
 Requires(post): /usr/sbin/alternatives
 Requires(preun): /usr/sbin/alternatives
 
@@ -131,6 +139,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 10 2013 Rex Dieter <rdieter at fedoraproject.org> 2.0.1-2
+- make OpenEXR_CTL support optional (since it doesn't support openexr-2.x yet)
+
 * Sat Oct 05 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.1-1
 - Update to 2.0.1
 


More information about the scm-commits mailing list