[OpenColorIO/el6] Rework el6 macros.

Richard Shaw hobbes1069 at fedoraproject.org
Fri Jun 15 15:04:10 UTC 2012


commit 742cfc5d9b7e6edf1b95ed2f4505742ac2edfacd
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Fri Jun 15 10:04:11 2012 -0500

    Rework el6 macros.

 OpenColorIO.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index 8194ca1..2a0e94d 100644
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -7,6 +7,11 @@
 %filter_setup
 }
 
+# Use cmake28 package on EL builds.
+%if 0%{?el6}
+%global %cmake %cmake28 -DCMAKE_SKIP_RPATH=OFF
+%endif
+
 Name:           OpenColorIO
 Version:        1.0.7
 Release:        4%{?dist}
@@ -90,11 +95,8 @@ rm -f ext/yaml*
 
 %build
 rm -rf build && mkdir build && pushd build
-%cmake28 -DOCIO_BUILD_STATIC=OFF \
+%cmake   -DOCIO_BUILD_STATIC=OFF \
          -DPYTHON_INCLUDE_LIB_PREFIX=OFF \
-%if 0%{?el6}
-         -DCMAKE_SKIP_RPATH=OFF \
-%endif
          -DOCIO_BUILD_DOCS=ON \
          -DOCIO_BUILD_TESTS=ON \
          -DOCIO_LINK_PYGLUE=ON \


More information about the scm-commits mailing list