[kipi-plugins] tweak to make buildable on systems without the requisite opencv for the removeredeyes plugin (like f

Rex Dieter rdieter at fedoraproject.org
Thu Sep 2 14:37:15 UTC 2010


commit ea10df7c8caf21c90e43f383a11b85fc47167ac9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 2 09:41:46 2010 -0500

    tweak to make buildable on systems without the requisite
    opencv for the removeredeyes plugin (like f12)

 kipi-plugins.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/kipi-plugins.spec b/kipi-plugins.spec
index 046512e..ba5db2a 100644
--- a/kipi-plugins.spec
+++ b/kipi-plugins.spec
@@ -1,6 +1,8 @@
 # Fedora review: http://bugzilla.redhat.com/171504
 
+%if 0%{?fedora} == 13
 %define opencv_version 2.0.0-9
+%endif
 %if 0%{?fedora} > 13
 %define opencv_version 2.1.0-5
 %endif
@@ -8,7 +10,7 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 1.4.0
-Release: 2%{?dist}
+Release: 0.2%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -37,7 +39,10 @@ BuildRequires: libxslt-devel
 ## DNG converter
 BuildRequires: expat-devel
 ## RemoveRedeye
-BuildRequires: opencv-devel%{?opencv_version: >= %{opencv_version}}
+%if 0%{?opencv_version:1}
+%define removeredeyes 1
+BuildRequires: opencv-devel >= %{opencv_version}
+%endif
 ## Shwup
 BuildRequires: qca2-devel
 
@@ -180,7 +185,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %{_kde4_libdir}/kde4/kipiplugin_piwigoexport.so
 %{_kde4_libdir}/kde4/kipiplugin_printimages.so
 %{_kde4_libdir}/kde4/kipiplugin_rawconverter.so
-%{_kde4_libdir}/kde4/kipiplugin_removeredeyes.so
 %{_kde4_libdir}/kde4/kipiplugin_sendimages.so
 %{_kde4_libdir}/kde4/kipiplugin_shwup.so
 %{_kde4_libdir}/kde4/kipiplugin_smug.so
@@ -191,7 +195,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %{_kde4_appsdir}/kipiplugin_imageviewer/
 %{_kde4_appsdir}/kipiplugin_piwigoexport/
 %{_kde4_appsdir}/kipiplugin_printimages/
-%{_kde4_appsdir}/kipiplugin_removeredeyes/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
 %{_kde4_datadir}/applications/kde4/scangui.desktop
@@ -205,6 +208,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 %{_kde4_appsdir}/kipiplugin_expoblending/
 %{_kde4_datadir}/applications/kde4/expoblending.desktop
 %endif
+%if 0%{?removeredeyes}
+%{_kde4_libdir}/kde4/kipiplugin_removeredeyes.so
+%{_kde4_appsdir}/kipiplugin_removeredeyes/
+%endif
 
 %files libs
 %defattr(-,root,root,-)


More information about the scm-commits mailing list