[calligra] reports-map-element uses marble too

[Rex Dieter]

commit 7b6b5ad5fdf0a7f1ff58fe5b70b0a82bfba9f8a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue May 29 19:26:43 2012 -0500

    reports-map-element uses marble too

 calligra.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index 9de941e..8b3a303 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -8,7 +8,7 @@
 
 %if 0%{?fedora} < 18
 # seems busted with marble-4.8.80+ -- rex
-%define map_shape 1
+%define marble 1
 %endif
 
 Name:    calligra 
@@ -47,7 +47,7 @@ BuildRequires: qt4-devel >= 4.8.1-5
 BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(gl) pkgconfig(glu) 
 BuildRequires: libjpeg-devel
-%if 0%{?map_shape}
+%if 0%{?marble}
 BuildRequires: marble-devel
 %endif
 BuildRequires: okular-devel
@@ -101,10 +101,10 @@ Requires:  %{name}-kformula = %{version}-%{release}
 %endif
 Requires:  %{name}-plan = %{version}-%{release}
 Requires:  %{name}-okular-odpgenerator = %{version}-%{release}
-%if 0%{?map_shape}
+%if 0%{?marble}
 Requires:  %{name}-map-shape = %{version}-%{release}
-%endif
 Requires:  %{name}-reports-map-element = %{version}-%{release}
+%endif
 
 %description
 %{summary}.
@@ -119,8 +119,9 @@ Provides:  calligra-filters = %{version}-%{release}
 Obsoletes: %{name}-kformula < %{version}-%{release}
 Obsoletes: %{name}-kformula-libs < %{version}-%{release}
 %endif
-%if ! 0%{?map_shape}
+%if ! 0%{?marble}
 Obsoletes: %{name}-map-shape < %{version}-%{release}
+Obsoletes: %{name}-reports-map-element < %{version}-%{release}
 %endif
 %if 0%{?external_lilypond_fonts}
 Requires: lilypond-emmentaler-fonts
@@ -730,15 +731,15 @@ fi
 %{_kde4_libdir}/libkformulaprivate.so.*
 %endif
 
-%if 0%{?map_shape}
+%if 0%{?marble}
 %files map-shape
 %{_kde4_libdir}/kde4/mapshape.so
 %{_kde4_datadir}/kde4/services/mapshape.desktop
-%endif
 
 %files reports-map-element
 %{_kde4_libdir}/kde4/koreport_mapsplugin.so
 %{_kde4_datadir}/kde4/services/koreport_mapsplugin.desktop
+%endif
 
 %posttrans sheets 
 update-desktop-database -q &> /dev/null ||: