[digikam/el6] fix BR for el6

nucleo nucleo at fedoraproject.org
Tue Jul 12 17:43:34 UTC 2011


commit d4bd900b87924c089318333e7422b9ccc7b67b5d
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jul 12 20:43:21 2011 +0300

    fix BR for el6

 digikam.spec |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/digikam.spec b/digikam.spec
index 46aa57d..d7b29e4 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,7 +1,7 @@
 
 Name:	 digikam
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -22,15 +22,19 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gphoto2-devel
-BuildRequires: libkdcraw-devel >= 0.4.0-2
-BuildRequires: libkexiv2-devel >= 0.5.0
-BuildRequires: libkipi-devel >= 0.3.0
-BuildRequires: liblqr-1-devel
+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
 BuildRequires: jasper-devel
 
 # 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} 
 
 BuildRequires: kdelibs4-devel
 
@@ -40,7 +44,8 @@ Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
-BuildRequires: lensfun-devel
+# not imported in EPEL6 yet
+#BuildRequires: lensfun-devel
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: soprano-devel
@@ -66,7 +71,8 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdeedu-marble-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}} 
+# if built with marble support
+#Requires: kdeedu-marble-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}} 
 %description libs
 %{summary}.
 
@@ -156,7 +162,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libdigikamcore.so.1*
 %{_kde4_libdir}/libdigikamdatabase.so.1*
-%{_kde4_libdir}/kde4/plugins/marble/ExternalDraw.so
+# if built with marble support
+#{_kde4_libdir}/kde4/plugins/marble/ExternalDraw.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -166,6 +173,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 12 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.2.0-3
+- fix BR for el6
+
 * Tue Mar 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-2
 - crash on startup in RatingWidget (kde#232628)
 


More information about the scm-commits mailing list