[digikam/el6] use conditionals

nucleo nucleo at fedoraproject.org
Tue Jul 12 17:56:03 UTC 2011


commit 730668ae0aa101f03987f594ce8e7230b858a607
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jul 12 20:55:48 2011 +0300

    use conditionals

 digikam.spec |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/digikam.spec b/digikam.spec
index d7b29e4..0283ad9 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -22,19 +22,23 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gphoto2-devel
+%if 0%{?fedora}
+BuildRequires: libkdcraw-devel >= 0.4.0-2
+BuildRequires: libkexiv2-devel >= 0.5.0
+BuildRequires: libkipi-devel >= 0.3.0
+# liblqr-1 and lensfun not imported yet in EPEL
+BuildRequires: liblqr-1-devel
+BuildRequires: lensfun-devel
+%else
 BuildRequires: kdegraphics-devel
-# libkdcraw-devel,  libkexiv2-devel, libkipi-devel missing in el6
-#BuildRequires: libkdcraw-devel >= 0.4.0-2
-#BuildRequires: libkexiv2-devel >= 0.5.0
-#BuildRequires: libkipi-devel >= 0.3.0
-
-# not imported in EPEL6 yet
-#BuildRequires: liblqr-1-devel
+%endif
 BuildRequires: jasper-devel
 
+%if 0%{?fedora}
 # marble integration, http://bugzilla.redhat.com/470578 
-#define marble_version 4.3.0
-#BuildRequires: kdeedu-devel >= %{marble_version} 
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
+%endif
 
 BuildRequires: kdelibs4-devel
 
@@ -44,8 +48,6 @@ Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
-# not imported in EPEL6 yet
-#BuildRequires: lensfun-devel
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: soprano-devel
@@ -71,8 +73,9 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-# if built with marble support
-#Requires: kdeedu-marble-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}} 
+%if 0%{?fedora}
+Requires: kdeedu-marble-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}} 
+%endif
 %description libs
 %{summary}.
 
@@ -162,8 +165,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libdigikamcore.so.1*
 %{_kde4_libdir}/libdigikamdatabase.so.1*
-# if built with marble support
-#{_kde4_libdir}/kde4/plugins/marble/ExternalDraw.so
+%if 0%{?fedora}
+%{_kde4_libdir}/kde4/plugins/marble/ExternalDraw.so
+%endif
 
 %files devel
 %defattr(-,root,root,-)


More information about the scm-commits mailing list