[calligra/epel7] rework wpd/visio macros

[Rex Dieter]

commit 489fa192c6a3c8f5927c37224059c0fcf621d723
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jun 24 12:08:16 2014 -0500

    rework wpd/visio macros
    
    visio missing on rhel7/ppc64 too

 calligra.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index 07f65bf..07c0a72 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -3,14 +3,17 @@
 %define koffice_ver 3:2.3.70
 
 %define postgresql 1
+%define wpd 1
 %if 0%{?fedora}
 %define marble 1
 %define okular 1
 %define pstoedit 1
+%define visio 1
 %endif
 %if 0%{?rhel}
 %ifnarch ppc64
 %define okular 1
+%define visio 1
 %endif
 %endif
 
@@ -70,19 +73,20 @@ BuildRequires: libjpeg-devel
 %if 0%{?marble}
 BuildRequires: marble-devel
 %endif
-%if 0%{?fedora} || 0%{?rhel} > 6
-%define visio 1
-# libwpd-devel and friends libwpg-devel, libwps-devel
-%define wpd 1
+%if 0%{?wpd)
 %if 0%{?revenge}
+%if 0%{?visio}
 BuildRequires: pkgconfig(libvisio-0.1)
+%endif
 BuildRequires: pkgconfig(libodfgen-0.1)
 BuildRequires: pkgconfig(librevenge-0.0)
 BuildRequires: pkgconfig(libwpd-0.10)
 BuildRequires: pkgconfig(libwpg-0.3)
 BuildRequires: pkgconfig(libwps-0.3)
 %else
+%if 0%{?visio}
 BuildRequires: pkgconfig(libvisio-0.0)
+%endif
 BuildRequires: pkgconfig(libodfgen-0.0)
 BuildRequires: pkgconfig(libwpd-0.9)
 BuildRequires: pkgconfig(libwpg-0.2)