rdieter pushed to calligra (f21). "drop libwps support for f23+, libwps-0.4 not (yet) supported"

[notifications at fedoraproject.org]

From a73e46c2de9b8e04c3bc0691ab35e0d134406bfc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 22 May 2015 16:56:49 -0500
Subject: drop libwps support for f23+, libwps-0.4 not (yet) supported


diff --git a/calligra.spec b/calligra.spec
index af6c9d0..293f961 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -14,6 +14,10 @@
 %endif
 %define visio 1
 %define wpd 1
+%if 0%{?fedora} < 23
+# rawhide's libwps-0.4 not supported (yet)
+%define wps 1
+%endif
 %endif
 %if 0%{?rhel}
 %ifnarch ppc64
@@ -21,6 +25,7 @@
 %define okular 1
 %define visio 1
 %define wpd 1
+%define wps 1
 %endif
 %endif
 
@@ -87,9 +92,11 @@ BuildRequires: pkgconfig(libodfgen-0.1)
 BuildRequires: pkgconfig(librevenge-0.0)
 BuildRequires: pkgconfig(libwpd-0.10)
 BuildRequires: pkgconfig(libwpg-0.3)
+%if 0%{?wps}
 BuildRequires: pkgconfig(libwps-0.3)
 %endif
 %endif
+%endif
 BuildRequires: pkgconfig(OpenColorIO)
 BuildRequires: pkgconfig(poppler-qt4)
 BuildRequires: pkgconfig(libpng)
@@ -1237,10 +1244,12 @@ fi
 %{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpd2odt.desktop
 %{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpg2odg.desktop
 %{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpg2svg.desktop
-%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wps2odt.desktop
 %{_kde4_libdir}/kde4/calligra_filter_wpd2odt.so
 %{_kde4_libdir}/kde4/calligra_filter_wpg2odg.so
 %{_kde4_libdir}/kde4/calligra_filter_wpg2svg.so
+%endif
+%if 0%{?wps}
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wps2odt.desktop
 %{_kde4_libdir}/kde4/calligra_filter_wps2odt.so
 %endif
 %{_kde4_datadir}/kde4/services/calligra_filter_odt2wiki.desktop
@@ -1299,7 +1308,7 @@ fi
 
 %changelog
 * Fri May 22 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-3
-- rebuild (libwps)
+- drop libwps support for f23+, libwps-0.4 not (yet) supported
 
 * Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-2
 - -qtquick subpkg, -kexi: move kexirelationdesignshape here
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=f21&id=a73e46c2de9b8e04c3bc0691ab35e0d134406bfc