[calligra] unconditionally Obsoletes: -map-shape

[Rex Dieter]

commit 938601a6afbad02bd4850fb5c2112f2ed6cb13b7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu May 31 14:13:23 2012 -0500

    unconditionally Obsoletes: -map-shape
    
    turns out this code was deprecated/removed in the latest beta.
    We'll see about rc, then remove it altogether if things stay the same.

 calligra.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index bd2bd8b..66c19ea 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -103,7 +103,7 @@ Requires:  %{name}-kformula = %{version}-%{release}
 Requires:  %{name}-plan = %{version}-%{release}
 Requires:  %{name}-okular-odpgenerator = %{version}-%{release}
 %if 0%{?marble}
-Requires:  %{name}-map-shape = %{version}-%{release}
+#Requires:  %{name}-map-shape = %{version}-%{release}
 Requires:  %{name}-reports-map-element = %{version}-%{release}
 Requires:  %{name}-kexi-map-form-widget = %{version}-%{release}
 %endif
@@ -121,8 +121,8 @@ Provides:  calligra-filters = %{version}-%{release}
 Obsoletes: %{name}-kformula < %{version}-%{release}
 Obsoletes: %{name}-kformula-libs < %{version}-%{release}
 %endif
-%if ! 0%{?marble}
 Obsoletes: %{name}-map-shape < %{version}-%{release}
+%if ! 0%{?marble}
 Obsoletes: %{name}-reports-map-element < %{version}-%{release}
 Requires:  %{name}-kexi-map-form-widget < %{version}-%{release}
 %endif
@@ -734,11 +734,13 @@ fi
 %{_kde4_libdir}/libkformulaprivate.so.*
 %endif
 
-%if 0%{?marble}
+%if 0
 %files map-shape
 %{_kde4_libdir}/kde4/mapshape.so
 %{_kde4_datadir}/kde4/services/mapshape.desktop
+%endif
 
+%if 0%{?marble}
 %files reports-map-element
 %{_kde4_libdir}/kde4/koreport_mapsplugin.so
 %{_kde4_datadir}/kde4/services/koreport_mapsplugin.desktop