[digikam/f20] fix old opencv hack

nucleo nucleo at fedoraproject.org
Fri Nov 14 14:12:19 UTC 2014


commit d3b97a6eb4fdbac0d42878114e6106d00a8ed403
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Nov 14 16:12:14 2014 +0200

    fix old opencv hack

 digikam.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/digikam.spec b/digikam.spec
index 8f2a1e9..b4368ec 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -242,10 +242,10 @@ BuildArch: noarch
 
 ## HACK to allow building with older opencv (for now), see
 # https://bugzilla.redhat.com/show_bug.cgi?id=1119036
-sed -i.opencv_247 -e 's|^DETECT_OPENCV(2.4.9 |DETECT_OPENCV(2.4.7 |' \
+sed -i.opencv_247 -e 's|^DETECT_OPENCV(2.4.9 |DETECT_OPENCV(2.4.7 |' extra/libkface/CMakeLists.txt
+sed -i.opencv_247 -e 's|OPENCV_MIN_VERSION "2.4.9"|OPENCV_MIN_VERSION "2.4.7"|' \
   core/CMakeLists.txt \
-  extra/kipi-plugins/CMakeLists.txt \
-  extra/libkface/CMakeLists.txt \
+  extra/kipi-plugins/CMakeLists.txt
 
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213


More information about the scm-commits mailing list