[calligra] macro'ize pstoedit support

Rex Dieter rdieter at fedoraproject.org
Tue Jun 24 13:27:52 UTC 2014


commit 444b1ca9e03a49c7bf00ffe356e5c1f95650fdc6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jun 24 08:27:45 2014 -0500

    macro'ize pstoedit support

 calligra.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/calligra.spec b/calligra.spec
index 436f098..d63b93f 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -5,6 +5,7 @@
 %if 0%{?fedora}
 %define marble 1
 %define postgresql 1
+%define pstoedit 1
 %endif
 
 # trim changelog included in binary rpms
@@ -101,7 +102,6 @@ BuildRequires: pkgconfig(OpenEXR)
 BuildRequires: openjpeg-devel
 BuildRequires: perl
 BuildRequires: pkgconfig(poppler-qt4)
-BuildRequires: pstoedit
 BuildRequires: pkgconfig(qca2)
 BuildRequires: readline-devel
 BuildRequires: pkgconfig(sqlite3)
@@ -312,8 +312,11 @@ Obsoletes: koffice-karbon < %{koffice_ver}
 Obsoletes: koffice-karbon-libs < %{koffice_ver}
 Requires: %{name}-core = %{version}-%{release}
 Requires: %{name}-karbon-libs%{?_isa} = %{version}-%{release}
+%if 0%{?pstoedit}
 # for karbon eps import filter
+BuildRequires: pstoedit
 Requires: pstoedit
+%endif
 %description karbon
 Karbon is a vector drawing application with an user interface that is
 easy to use, highly customizable and extensible. That makes Karbon a
@@ -640,9 +643,11 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/koreport_itemplugin.desktop
 %{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
 %{_kde4_datadir}/kde4/servicetypes/widgetfactory.desktop
+%if 0%{?pstoedit}
 %{_kde4_libdir}/kde4/calligra_filter_eps2svgai.so
-%{_kde4_libdir}/kde4/calligra_filter_pdf2svg.so
 %{_kde4_datadir}/kde4/services/calligra_filter_eps2svgai.desktop
+%endif
+%{_kde4_libdir}/kde4/calligra_filter_pdf2svg.so
 %{_kde4_datadir}/kde4/services/calligra_filter_pdf2svg.desktop
 %{_kde4_datadir}/kde4/services/calligra_shape_artistictext.desktop
 %{_kde4_datadir}/kde4/services/calligra_shape_chart.desktop


More information about the scm-commits mailing list