[calligra/epel7] macro'ize okular support

Rex Dieter rdieter at fedoraproject.org
Tue Jun 24 16:22:04 UTC 2014


commit 4040d975c10ab1d281141316ea44d1fd1b1ab205
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jun 24 11:19:20 2014 -0500

    macro'ize okular support
    
    since rhel7 ppc64 has no okular :(

 calligra.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index f547ed8..07f65bf 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -5,8 +5,15 @@
 %define postgresql 1
 %if 0%{?fedora}
 %define marble 1
+%define okular 1
 %define pstoedit 1
 %endif
+%if 0%{?rhel}
+%ifnarch ppc64
+%define okular 1
+%endif
+%endif
+
 
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
@@ -63,7 +70,6 @@ BuildRequires: libjpeg-devel
 %if 0%{?marble}
 BuildRequires: marble-devel
 %endif
-BuildRequires: okular-devel
 %if 0%{?fedora} || 0%{?rhel} > 6
 %define visio 1
 # libwpd-devel and friends libwpg-devel, libwps-devel
@@ -138,7 +144,9 @@ Requires:  %{name}-kexi-driver-postgresql = %{version}-%{release}
 %endif
 Requires:  %{name}-kexi-driver-sybase = %{version}-%{release}
 Requires:  %{name}-plan = %{version}-%{release}
+%if 0%{?okular}
 Requires:  %{name}-okular-odpgenerator = %{version}-%{release}
+%endif
 %if 0%{?marble}
 Requires:  %{name}-reports-map-element = %{version}-%{release}
 Requires:  %{name}-kexi-map-form-widget = %{version}-%{release}
@@ -445,13 +453,16 @@ Requires: %{name}-plan = %{version}-%{release}
 %description plan-libs
 %{summary}.
 
+%if 0%{?okular}
 %package  okular-odpgenerator
 Summary:  OpenDocument presenter support for okular
 Obsoletes: koffice-okular-odpgenerator < %{koffice_ver}
+BuildRequires: okular-devel
 Requires: %{name}-stage = %{version}-%{release}
 Requires: okular-part%{?_kde4_version: >= %{_kde4_version}}
 %description okular-odpgenerator
 %{summary}.
+%endif
 
 %package semanticitems
 Summary: RDF support
@@ -1184,11 +1195,13 @@ fi
 %files words-libs
 %{_kde4_libdir}/libwordsprivate.so.*
 
+%if 0%{?okular}
 %files okular-odpgenerator
 %{_kde4_libdir}/kde4/okularGenerator_odp.so
 %{_kde4_datadir}/applications/kde4/okularApplication_odp.desktop
 %{_kde4_datadir}/kde4/services/libokularGenerator_odp.desktop
 %{_kde4_datadir}/kde4/services/okularOdp.desktop
+%endif
 
 %files semanticitems
 %{_kde4_libdir}/kde4/calligra_semanticitem_contact.so


More information about the scm-commits mailing list