[calligra] kexi-map-form-widget relies on marble too

[Rex Dieter]

commit 7757f5ce0f6298d0bce9ca4d07a13a39f1425a8a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed May 30 10:00:16 2012 -0500

    kexi-map-form-widget relies on marble too

 calligra.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index ff6f57a..d7504eb 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -95,7 +95,6 @@ Requires:  %{name}-kexi = %{version}-%{release}
 Requires:  %{name}-kexi-driver-mysql = %{version}-%{release}
 Requires:  %{name}-kexi-driver-postgresql = %{version}-%{release}
 Requires:  %{name}-kexi-driver-sybase = %{version}-%{release}
-Requires:  %{name}-kexi-map-form-widget = %{version}-%{release}
 %if 0%{?kformula}
 Requires:  %{name}-kformula = %{version}-%{release}
 %endif
@@ -104,6 +103,7 @@ Requires:  %{name}-okular-odpgenerator = %{version}-%{release}
 %if 0%{?marble}
 Requires:  %{name}-map-shape = %{version}-%{release}
 Requires:  %{name}-reports-map-element = %{version}-%{release}
+Requires:  %{name}-kexi-map-form-widget = %{version}-%{release}
 %endif
 
 %description
@@ -122,6 +122,7 @@ Obsoletes: %{name}-kformula-libs < %{version}-%{release}
 %if ! 0%{?marble}
 Obsoletes: %{name}-map-shape < %{version}-%{release}
 Obsoletes: %{name}-reports-map-element < %{version}-%{release}
+Requires:  %{name}-kexi-map-form-widget < %{version}-%{release}
 %endif
 %if 0%{?external_lilypond_fonts}
 Requires: lilypond-emmentaler-fonts
@@ -912,7 +913,6 @@ fi
 %{_kde4_bindir}/kexi*
 %{_kde4_libdir}/kde4/kformdesigner_containers.so
 %{_kde4_libdir}/kde4/kformdesigner_kexidbwidgets.so
-%{_kde4_libdir}/kde4/kformdesigner_mapbrowser.so
 %{_kde4_libdir}/kde4/kformdesigner_stdwidgets.so
 %{_kde4_libdir}/kde4/kformdesigner_webbrowser.so
 %{_kde4_libdir}/kde4/kexihandler_*.*
@@ -960,9 +960,11 @@ fi
 %{_kde4_datadir}/kde4/services/kexidb_sybasedriver.desktop
 %{_kde4_datadir}/kde4/services/keximigrate_sybase.desktop
 
+%if 0%{?marble}
 %files kexi-map-form-widget
 %{_kde4_libdir}/kde4/kformdesigner_mapbrowser.so
 %{_kde4_datadir}/kde4/services/kformdesigner/kformdesigner_mapbrowser.desktop
+%endif
 
 %files kexi-spreadsheet-import
 %{_kde4_libdir}/kde4/keximigrate_spreadsheet.so